Nuove opzioni ediff in emacs_cross.

diff --git a/tools/emacs_cross b/tools/emacs_cross
index 1e38881c3b6f88ad4ee335f94350f7b0a926ad25..734f22135f36baacb795c217abfed5e3471dad37 100644 (file)
--- a/tools/emacs_cross
+++ b/tools/emacs_cross
@@ -84,7 +84,6 @@
 
 ;; horizontal split
 (setq split-width-threshold nil)
-(setq ediff-split-window-function 'split-window-horizontally)
 
 ;; default frame size and position
 (when window-system
@@ -111,6 +110,12 @@
                (newline-mark 10 [182 10])
                (tab-mark 9 [8594 9] [92 9])))
 
+;; ediff
+(setq ediff-split-window-function 'split-window-horizontally)
+(winner-mode)
+(add-hook 'ediff-after-quit-hook-internal 'winner-undo)
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 ;; dired-x
 ;; omit dot files
 (require 'dired-x)