From 3027c3ef64749ae121954cc847668be9d6a2d1c7 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 9 May 2022 15:44:24 +0200 Subject: fix(sterni/emacs): prevent ediff from creating a new window 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 Autosubmit: sterni Tested-by: BuildkiteCI --- users/sterni/emacs/init.el | 4 ++++ 1 file changed, 4 insertions(+) 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) -- cgit 1.4.1