Permalink
Browse files

Merge branch 'master' of github.com:bbatsov/emacs-prelude

  • Loading branch information...
2 parents 100055e + b6f47bf commit a732fef4fbaa7692eb43a932ba5d342483df86fe Bozhidar Batsov committed Feb 16, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 modules/prelude-editor.el
View
3 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

0 comments on commit a732fef

Please sign in to comment.