From c271947e68cf08e1e6fd66c2c914ab322b0c64c8 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Fri, 28 Mar 2025 18:38:51 +0100 Subject: [PATCH] Require at least Emacs 30 --- README.org | 2 +- init.el | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/README.org b/README.org index a1e31ea..31807a2 100644 --- a/README.org +++ b/README.org @@ -3,7 +3,7 @@ My personal Emacs Configuration, containing bits of code collected from around the web. Have fun with it! -This configuration is known to work with Emacs 29.1 (and later) on +This configuration is known to work with Emacs 30.1 (and later) on Debian GNU/Linux and Windows 11 (sigh). * Features diff --git a/init.el b/init.el index 574070a..5a4a55f 100644 --- a/init.el +++ b/init.el @@ -22,7 +22,7 @@ ;; * Preliminaries (constants and path settings) -(when (version< emacs-version "29") +(when (version< emacs-version "30") (error "Emacs version is too old! We need at least Emacs 29, but this is %s" emacs-version)) @@ -1970,8 +1970,7 @@ Note that this workaround is incomplete, as explained in this comment." gnutls-verify-error t)) (use-package epa - :init (when (version<= "30" emacs-version) - (setq epa-keys-select-method 'minibuffer))) + :init (setq epa-keys-select-method 'minibuffer)) (use-package epg :init (setq epg-debug t @@ -2091,11 +2090,9 @@ Note that this workaround is incomplete, as explained in this comment." dired-isearch-filenames 'dwim dired-auto-revert-buffer t dired-clean-confirm-killing-deleted-buffers t - dired-clean-up-buffers-too t) - - (when (version<= "30" emacs-version) - (setq dired-movement-style 'bounded - dired-filename-display-length nil)) + dired-clean-up-buffers-too t + dired-movement-style 'bounded + dired-filename-display-length nil) (setq dired-guess-shell-alist-user '(("\\.pdf\\'" "evince") @@ -2652,10 +2649,7 @@ eventuelly be set to nil, however)." eshell-prompt-function #'eshell/default-prompt-function eshell-highlight-prompt nil eshell-cd-on-directory t - eshell-expand-input-functions '(eshell-expand-history-references)) - - (when (version< emacs-version "30") - (setq eshell-prompt-regexp "└─[$#] "))) + eshell-expand-input-functions '(eshell-expand-history-references))) :bind (:map eshell-mode-map ("M-P" . eshell-previous-prompt) @@ -2683,10 +2677,6 @@ eventuelly be set to nil, however)." (add-hook 'eshell-mode-hook 'with-editor-export-editor) - (when (version< emacs-version "30") - (autoload 'eshell-bol "esh-mode.el") - (bind-key "C-a" #'eshell-bol eshell-mode-map)) - ;; Ignoring case when completing file names seems to have a ;; bug: when a ~ is encountered, it is implicitly expaned by ;; `pcomplete-insert-entry’, overwriting the prompt as a side