aboutsummaryrefslogtreecommitdiffstats
path: root/oni-ediff.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2020-11-06 16:49:34 -0800
committerGravatar Tom Willemse2020-11-06 16:49:34 -0800
commit344bf537d4303ca4b8bc733a17811abd0b1deacd (patch)
tree60d6ac55e8bf15ea46fecfe7ef60e81e7df0a0a1 /oni-ediff.el
parent6caa9016267309a0bfa9a4b0f6052c0eb411eb14 (diff)
downloademacs-config-344bf537d4303ca4b8bc733a17811abd0b1deacd.tar.gz
emacs-config-344bf537d4303ca4b8bc733a17811abd0b1deacd.zip
Call ‘winner-undo’ when ediff finishes
This way the window layout that was used before ediff was started gets restored.
Diffstat (limited to 'oni-ediff.el')
-rw-r--r--oni-ediff.el3
1 files changed, 2 insertions, 1 deletions
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 <tom@ryuslash.org>
;; 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))