From af287828c90c9251ad6af23dc47531549f3d2fd2 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 15 Feb 2016 23:29:33 -0500 Subject: ediff: Restore window configuration --- init.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'init.el') 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 -- cgit v1.2.3