diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-12 18:26:53 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 18:26:53 +0000 |
| commit | 075e43abb266be36d3c1e9f6d783bbbcf2da21b5 (patch) | |
| tree | f7596f4cd6013ba1d5ab375cc8549fa10703b3d7 /modules/workstation/emacs/init.el | |
| parent | fa445f14361d91f8a7840a39ad6c29572a847053 (diff) | |
| download | nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar.gz nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar.bz2 nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar.lz nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar.xz nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.tar.zst nixlib-075e43abb266be36d3c1e9f6d783bbbcf2da21b5.zip | |
modules/emacs: make ediff stay within one frame
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. |