diff --git a/README.md b/README.md index 41be99b..fa36e53 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ git clone https://github.com/jamescherti/minimal-emacs.d ~/.emacs.d 10. **Miscellaneous** - Configure recentf, savehist, and auto-save + - Configure Ediff to use a single frame and split windows horizontally ## Update diff --git a/init.el b/init.el index d7667de..6942a32 100644 --- a/init.el +++ b/init.el @@ -336,6 +336,12 @@ ;; Avoid automatic frame resizing when adjusting settings. (setq global-text-scale-adjust-resizes-frames nil) +;;; Ediff + +;; Configure Ediff to use a single frame and split windows horizontally +(setq ediff-window-setup-function #'ediff-setup-windows-plain + ediff-split-window-function #'split-window-horizontally) + ;;; Load post-init.el (minimal-emacs-load-user-init "post-init.el")