Merge branch 'master' of github.com:bbatsov/emacs-prelude
This commit is contained in:
commit
a732fef4fb
1 changed files with 3 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue