diff options
Diffstat (limited to 'modules/workstation/emacs/init.el')
| -rw-r--r-- | modules/workstation/emacs/init.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el index c0b4e4b9a012..85799ea18137 100644 --- a/modules/workstation/emacs/init.el +++ b/modules/workstation/emacs/init.el @@ -67,6 +67,10 @@ (direnv-mode) (global-set-key (kbd "C-c d") 'direnv-update-environment) +;;; Ediff ;;; +;; Don't make a new frame for Ediff controls. +(setq ediff-window-setup-function 'ediff-setup-windows-plain) + ;;; Eglot ;;; (with-eval-after-load 'eglot ;; Override default LSPs for languages. |