From: Andrea Zagli <andrea.zagli@email.it>
Date: Thu, 6 Apr 2017 08:23:08 +0000 (+0200)
Subject: Nuove opzioni ediff in emacs_cross.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5f0e617ca9e6c4b5b8be84e6e66c9293fc740122;p=msys2

Nuove opzioni ediff in emacs_cross.
---

diff --git a/tools/emacs_cross b/tools/emacs_cross
index 1e38881..734f221 100644
--- 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)