diff options
Diffstat (limited to 'emacs/.emacs.d/init/ycp-vc.el')
| -rw-r--r-- | emacs/.emacs.d/init/ycp-vc.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el index 57de6f1..4513d45 100644 --- a/emacs/.emacs.d/init/ycp-vc.el +++ b/emacs/.emacs.d/init/ycp-vc.el @@ -71,6 +71,7 @@ (setq ediff-make-buffers-readonly-at-startup nil) (setq ediff-show-clashes-only t) (setq ediff-split-window-function 'split-window-horizontally) + (add-hook 'ediff-before-setup-hook 'my-select-new-frame) (setq ediff-combination-pattern '("<<<<<<< A: HEAD" A "||||||| Ancestor" Ancestor @@ -119,6 +120,9 @@ (require 'magit-repos) (my-setq-from-local magit-repository-directories) (put 'magit-clean 'disabled nil) + + (require 'magit-ediff) + (add-hook 'magit-ediff-quit-hook 'delete-frame) ) (my-package my-magit |