Merge pull request #68 from gleber/fix-ediff-unnecessary-frame

Fix ediff unnecessary frame
14 years ago · b6f47bf5dd
1 changed files with 3 additions and 0 deletions
--- a/modules/prelude-editor.el
+++ b/modules/prelude-editor.el
@ -175,6 +175,9 @@
 ;; dired - reuse current buffer by pressing 'a'
 (put 'dired-find-alternate-file 'disabled nil)
 ;; ediff - don't start another frame
 (setq ediff-window-setup-function 'ediff-setup-windows-plain)
 (provide 'prelude-editor)
 ;;; prelude-editor.el ends here