From 344bf537d4303ca4b8bc733a17811abd0b1deacd Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 6 Nov 2020 16:49:34 -0800 Subject: [PATCH] =?UTF-8?q?Call=20=E2=80=98winner-undo=E2=80=99=20when=20e?= =?UTF-8?q?diff=20finishes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way the window layout that was used before ediff was started gets restored. --- oni-ediff.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oni-ediff.el b/oni-ediff.el index 8ea9589..cb52386 100644 --- a/oni-ediff.el +++ b/oni-ediff.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2019.1010.164050 +;; Version: 2020.1106.164913 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -72,6 +72,7 @@ (add-hook 'ediff-mode-hook #'oni-ediff--turn-on-fullscreen) (add-hook 'ediff-cleanup-hook #'oni-ediff--turn-off-fullscreen) +(add-hook 'ediff-cleanup-hook 'winner-undo) ;;;###autoload(with-eval-after-load 'ediff (require 'oni-ediff))