diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2014-10-31 23:21:51 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2014-10-31 23:21:51 -0400 |
| commit | ead70ce0060c1efb815f9f099d6e98c26523971d (patch) | |
| tree | f094d4deffe67dbbbc195f800ccc9d8ec05a890f | |
| parent | cb3faf578566d6c59474a4bc0cf089afa6ea3b75 (diff) | |
| download | emacs.d-ead70ce0060c1efb815f9f099d6e98c26523971d.tar.gz | |
Don't use new frame for Ediff control panel
| -rw-r--r-- | lisp/init-external.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/init-external.el b/lisp/init-external.el index baad4ef..9732b58 100644 --- a/lisp/init-external.el +++ b/lisp/init-external.el @@ -97,6 +97,8 @@ monitor setup)." (revert-buffer) (view-mode 1)) +(setq ediff-window-setup-function 'ediff-setup-windows-plain) + (define-key km/external-map "d" 'diff) (define-key km/external-map "e" 'ediff) (after 'diff |