Compare commits

...

2 Commits

2 changed files with 7 additions and 18 deletions

View File

@ -3,7 +3,7 @@
My personal Emacs Configuration, containing bits of code collected from around My personal Emacs Configuration, containing bits of code collected from around
the web. Have fun with it! 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). Debian GNU/Linux and Windows 11 (sigh).
* Features * Features

23
init.el
View File

@ -22,7 +22,7 @@
;; * Preliminaries (constants and path settings) ;; * 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" (error "Emacs version is too old! We need at least Emacs 29, but this is %s"
emacs-version)) emacs-version))
@ -466,7 +466,6 @@
:commands (projectile-mode) :commands (projectile-mode)
:bind (:map projectile-mode-map ("C-c p" . projectile-command-map)) :bind (:map projectile-mode-map ("C-c p" . projectile-command-map))
:init (setq projectile-switch-project-action 'projectile-dired :init (setq projectile-switch-project-action 'projectile-dired
projectile-completion-system 'helm
projectile-ignored-project-function #'file-remote-p projectile-ignored-project-function #'file-remote-p
projectile-create-missing-test-files t projectile-create-missing-test-files t
projectile-known-projects-file (expand-file-name "projectile-bookmarks.eld" projectile-known-projects-file (expand-file-name "projectile-bookmarks.eld"
@ -1970,8 +1969,7 @@ Note that this workaround is incomplete, as explained in this comment."
gnutls-verify-error t)) gnutls-verify-error t))
(use-package epa (use-package epa
:init (when (version<= "30" emacs-version) :init (setq epa-keys-select-method 'minibuffer))
(setq epa-keys-select-method 'minibuffer)))
(use-package epg (use-package epg
:init (setq epg-debug t :init (setq epg-debug t
@ -2091,11 +2089,9 @@ Note that this workaround is incomplete, as explained in this comment."
dired-isearch-filenames 'dwim dired-isearch-filenames 'dwim
dired-auto-revert-buffer t dired-auto-revert-buffer t
dired-clean-confirm-killing-deleted-buffers t dired-clean-confirm-killing-deleted-buffers t
dired-clean-up-buffers-too t) dired-clean-up-buffers-too t
dired-movement-style 'bounded
(when (version<= "30" emacs-version) dired-filename-display-length nil)
(setq dired-movement-style 'bounded
dired-filename-display-length nil))
(setq dired-guess-shell-alist-user (setq dired-guess-shell-alist-user
'(("\\.pdf\\'" "evince") '(("\\.pdf\\'" "evince")
@ -2652,10 +2648,7 @@ eventuelly be set to nil, however)."
eshell-prompt-function #'eshell/default-prompt-function eshell-prompt-function #'eshell/default-prompt-function
eshell-highlight-prompt nil eshell-highlight-prompt nil
eshell-cd-on-directory t eshell-cd-on-directory t
eshell-expand-input-functions '(eshell-expand-history-references)) eshell-expand-input-functions '(eshell-expand-history-references)))
(when (version< emacs-version "30")
(setq eshell-prompt-regexp "└─[$#] ")))
:bind (:map eshell-mode-map :bind (:map eshell-mode-map
("M-P" . eshell-previous-prompt) ("M-P" . eshell-previous-prompt)
@ -2683,10 +2676,6 @@ eventuelly be set to nil, however)."
(add-hook 'eshell-mode-hook (add-hook 'eshell-mode-hook
'with-editor-export-editor) '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 ;; Ignoring case when completing file names seems to have a
;; bug: when a ~ is encountered, it is implicitly expaned by ;; bug: when a ~ is encountered, it is implicitly expaned by
;; `pcomplete-insert-entry, overwriting the prompt as a side ;; `pcomplete-insert-entry, overwriting the prompt as a side