ediff: Set more pleasing ediff settings

Instead of opening the ediff frame open a new buffer and show a side
to side diff.
This commit is contained in:
finga 2024-09-04 08:46:08 +02:00
parent 78ee3d7747
commit d39614d8e8
3 changed files with 12 additions and 0 deletions

10
.emacs.d/config/ediff.el Normal file
View file

@ -0,0 +1,10 @@
(use-package ediff
:config
(setq diff-switches "-u"
ediff-custom-diff-options "-U3"
ediff-split-window-function 'split-window-horizontally
ediff-window-setup-function 'ediff-setup-windows-plain)
:hook
(ediff-startup . ediff-toggle-wide-display)
(ediff-cleanup . ediff-toggle-wide-display)
(ediff-suspend . ediff-toggle-wide-display))

View file

@ -62,6 +62,7 @@ symbols, which are converted to strings, and suffixed with \".el\"."
c c
calendar calendar
dev dev
ediff
functions functions
git git
gpg gpg

View file

@ -4,6 +4,7 @@
!/.emacs.d/config/calendar.el !/.emacs.d/config/calendar.el
!/.emacs.d/config/c.el !/.emacs.d/config/c.el
!/.emacs.d/config/dev.el !/.emacs.d/config/dev.el
!/.emacs.d/config/ediff.el
!/.emacs.d/config/functions.el !/.emacs.d/config/functions.el
!/.emacs.d/config/git.el !/.emacs.d/config/git.el
!/.emacs.d/config/gpg.el !/.emacs.d/config/gpg.el