about summary refs log tree commit diff
path: root/users/sterni
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-05-09T13·44+0200
committerclbot <clbot@tvl.fyi>2022-05-09T13·53+0000
commit3027c3ef64749ae121954cc847668be9d6a2d1c7 (patch)
treedff4ac4590afa84e878cd92839de58d21c01d0d4 /users/sterni
parent952922a0a9e1d1a000dc64b5ecba6bd55de9169d (diff)
fix(sterni/emacs): prevent ediff from creating a new window r/4022
This is really annoying since the window is not recognized as a popup /
dialog window by sway.

Change-Id: Icacf7f673e6d96915711950185a704fccd95aed3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5542
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/sterni')
-rw-r--r--users/sterni/emacs/init.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el
index e04ed724bfdb..80ea16d42901 100644
--- a/users/sterni/emacs/init.el
+++ b/users/sterni/emacs/init.el
@@ -107,6 +107,10 @@
         org-default-notes-file (concat org-folder "/inbox.org")
         initial-buffer-choice org-default-notes-file))
 
+;; ediff
+; doesn't create new window for ediff controls which I always open accidentally
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 ;;; Configure packages
 (require 'use-package)