From e0b5e893d8a8cdedb7131da2b37a2ffcc0f00946 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 8 Sep 2023 15:58:55 -0400 Subject: [PATCH] Use page-break-lines mode and remove ediff. --- ansible/roles/emacs/files/elisp/base-extensions.el | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ansible/roles/emacs/files/elisp/base-extensions.el b/ansible/roles/emacs/files/elisp/base-extensions.el index f78dfb1..320b43d 100644 --- a/ansible/roles/emacs/files/elisp/base-extensions.el +++ b/ansible/roles/emacs/files/elisp/base-extensions.el @@ -27,18 +27,16 @@ :config (dashboard-setup-startup-hook)) -(use-package ediff - :config - (setq ediff-window-setup-function 'ediff-setup-windows-plain) - (setq-default ediff-highlight-all-diffs 'nil) - (setq ediff-diff-options "-w")) - (when (version<= "26.0.50" emacs-version ) (add-hook 'prog-mode-hook 'display-line-numbers-mode) (add-hook 'prog-mode-hook 'column-number-mode) ) -(use-package page-break-lines) +;; Display a horizontal line instead of ^L for page break characters +(use-package page-break-lines + :config + (global-page-break-lines-mode +1) + ) (use-package recentf ;; This is an emacs built-in but we're pulling the latest version