--- a/.emacs-my Thu Oct 11 14:03:12 2012 +0300
+++ b/.emacs-my Thu Oct 11 14:06:01 2012 +0300
@@ -220,6 +220,7 @@
(mouse-avoidance-mode 'animate)
(scroll-bar-mode 1)
(tool-bar-mode -1)
+ (setq-default line-spacing nil)
(defun my-popup-menu ()
(interactive)
(mouse-popup-menubar
@@ -1867,6 +1868,7 @@
(setq ediff-diff-options "")
(setq ediff-custom-diff-options "-u")
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+(setq ediff-split-window-function 'split-window-vertically)
(when window-system
(eval-after-load 'diff-mode