ryuslash/emacs-config
1
0
Fork 0
Code Activity

Call ‘winner-undo’ when ediff finishes

Browse source 
This way the window layout that was used before ediff was started gets restored.
This commit is contained in:
Tom Willemse 2020-11-06 16:49:34 -08:00
parent 6caa901626
commit 344bf537d4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
oni-ediff.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2019.1010.164050 ;; Version: 2020.1106.164913
;; This program is free software; you can redistribute it and/or modify ;; 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 ;; 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-mode-hook #'oni-ediff--turn-on-fullscreen)
(add-hook 'ediff-cleanup-hook #'oni-ediff--turn-off-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)) ;;;###autoload(with-eval-after-load 'ediff (require 'oni-ediff))