jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix ediff unnecessary frame
This commit is contained in:
Bozhidar Batsov 2012-02-16 02:21:00 -08:00
commit b6f47bf5dd
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/prelude-editor.el
View file

@ -175,6 +175,9 @@
;; dired - reuse current buffer by pressing 'a' ;; dired - reuse current buffer by pressing 'a'
(put 'dired-find-alternate-file 'disabled nil) (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) (provide 'prelude-editor)
;;; prelude-editor.el ends here ;;; prelude-editor.el ends here