From c779b12688a60ccf60e04661e1160073d8155d1e Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Sun, 10 Dec 2023 14:35:36 -0600 Subject: [PATCH] Minor edits --- .config/emacs/config.el | 4 ++-- .config/emacs/config.org | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/emacs/config.el b/.config/emacs/config.el index e3113ea..74b5204 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -75,8 +75,8 @@ (drag-stuff-global-mode 1) (drag-stuff-define-keys)) -;;(setq ediff-split-window-function 'split-window-horizontally -;; ediff-window-setup-function 'ediff-setup-windows-plain) +(setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain) (defun dt-ediff-hook () (ediff-setup-keymap) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index 295ecc5..2a0e3e9 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -183,8 +183,8 @@ This package implements hiding or abbreviation of the modeline displays (lighter 'ediff' is a diff program that is built into Emacs. By default, 'ediff' splits files vertically and places the 'help' frame in its own window. I have changed this so the two files are split horizontally and the 'help' frame appears as a lower split within the existing window. Also, I create my own 'dt-ediff-hook' where I add 'j/k' for moving to next/prev diffs. By default, this is set to 'n/p'. #+begin_src emacs-lisp -;;(setq ediff-split-window-function 'split-window-horizontally -;; ediff-window-setup-function 'ediff-setup-windows-plain) +(setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain) (defun dt-ediff-hook () (ediff-setup-keymap)