summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-02-15 23:29:33 -0500
committerKyle Meyer <kyle@kyleam.com>2016-02-15 23:29:33 -0500
commitaf287828c90c9251ad6af23dc47531549f3d2fd2 (patch)
tree3dafc25f4cb26062a1fddc89b5a3ddb3e7b6e2b6 /init.el
parent8d15b9f5a7de07f2f956fea3ed4007b68a9fb50c (diff)
downloademacs.d-af287828c90c9251ad6af23dc47531549f3d2fd2.tar.gz
ediff: Restore window configuration
Diffstat (limited to 'init.el')
-rw-r--r--init.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/init.el b/init.el
index e94eafb..59f0d73 100644
--- a/init.el
+++ b/init.el
@@ -1460,7 +1460,10 @@
(define-key km/external-map "o" #'km/diff-with-other-window)
(define-key km/external-map "O" #'km/ediff-with-other-window)
(after 'diff-mode
- (define-key diff-mode-map (kbd "C-c C-l") #'km/diff-lock-buffer)))
+ (define-key diff-mode-map (kbd "C-c C-l") #'km/diff-lock-buffer))
+ (after 'ediff
+ (add-hook 'ediff-before-setup-hook #'km/ediff-save-window-config)
+ (add-hook 'ediff-quit-hook #'km/ediff-restore-window-config)))
;;; Text modes