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

This commit is contained in:
Bozhidar Batsov 2012-02-16 12:41:09 +02:00
commit a732fef4fb

View file

@ -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