From 075e43abb266be36d3c1e9f6d783bbbcf2da21b5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 12 Jan 2021 18:26:53 +0000
Subject: modules/emacs: make ediff stay within one frame

---
 modules/workstation/emacs/init.el | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/workstation/emacs/init.el')

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.
-- 
cgit 1.4.1