Adapt some obsolete configuration for transition to Emacs 30
This commit is contained in:
parent
de123f7cea
commit
0ba2fc5fd7
45
init.el
45
init.el
@ -2606,21 +2606,24 @@ eventuelly be set to nil, however)."
|
|||||||
|
|
||||||
(use-package eshell
|
(use-package eshell
|
||||||
:commands (eshell)
|
:commands (eshell)
|
||||||
:init (setq eshell-cmpl-cycle-completions nil
|
:init (progn
|
||||||
eshell-scroll-to-bottom-on-input t
|
(setq eshell-cmpl-cycle-completions nil
|
||||||
eshell-prefer-lisp-functions nil
|
eshell-scroll-to-bottom-on-input t
|
||||||
eshell-error-if-no-glob nil
|
eshell-prefer-lisp-functions nil
|
||||||
eshell-hist-ignoredups t
|
eshell-error-if-no-glob nil
|
||||||
eshell-save-history-on-exit t
|
eshell-hist-ignoredups t
|
||||||
eshell-history-size 5000
|
eshell-save-history-on-exit t
|
||||||
eshell-history-file-name (expand-file-name "eshell/history" emacs-d-userdata)
|
eshell-history-size 5000
|
||||||
eshell-last-dir-ring-file-name (expand-file-name "eshell/lastdir" emacs-d-userdata)
|
eshell-history-file-name (expand-file-name "eshell/history" emacs-d-userdata)
|
||||||
eshell-destroy-buffer-when-process-dies t
|
eshell-last-dir-ring-file-name (expand-file-name "eshell/lastdir" emacs-d-userdata)
|
||||||
eshell-prompt-function #'eshell/default-prompt-function
|
eshell-destroy-buffer-when-process-dies t
|
||||||
eshell-prompt-regexp "└─[$#] "
|
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 "└─[$#] ")))
|
||||||
:config (progn
|
:config (progn
|
||||||
|
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
@ -2641,7 +2644,11 @@ eventuelly be set to nil, however)."
|
|||||||
(add-hook 'eshell-mode-hook
|
(add-hook 'eshell-mode-hook
|
||||||
'with-editor-export-editor)
|
'with-editor-export-editor)
|
||||||
|
|
||||||
(bind-key "C-a" #'eshell-bol eshell-mode-map)
|
(if (version< emacs-version "30")
|
||||||
|
(progn
|
||||||
|
(autoload 'eshell-bol "esh-mode.el")
|
||||||
|
(bind-key "C-a" #'eshell-bol eshell-mode-map))
|
||||||
|
(bind-key "C-a" #'beginning-of-line eshell-mode-map))
|
||||||
(bind-key "M-r" #'eshell-insert-history eshell-hist-mode-map)
|
(bind-key "M-r" #'eshell-insert-history eshell-hist-mode-map)
|
||||||
(bind-key "M-P" #'eshell-previous-prompt eshell-mode-map)
|
(bind-key "M-P" #'eshell-previous-prompt eshell-mode-map)
|
||||||
(bind-key "M-N" #'eshell-next-prompt eshell-mode-map)
|
(bind-key "M-N" #'eshell-next-prompt eshell-mode-map)
|
||||||
@ -2692,13 +2699,10 @@ eventuelly be set to nil, however)."
|
|||||||
|
|
||||||
(require 'db-eshell)))
|
(require 'db-eshell)))
|
||||||
|
|
||||||
(use-package em-prompt ; Why is this extra declaration necessary?
|
(use-package em-prompt
|
||||||
:commands (eshell-previous-prompt
|
:commands (eshell-previous-prompt
|
||||||
eshell-next-prompt))
|
eshell-next-prompt))
|
||||||
|
|
||||||
(use-package esh-mode ; Why is this extra declaration necessary?
|
|
||||||
:commands (eshell-bol))
|
|
||||||
|
|
||||||
(use-package with-editor
|
(use-package with-editor
|
||||||
:commands (with-editor-export-editor))
|
:commands (with-editor-export-editor))
|
||||||
|
|
||||||
@ -2763,7 +2767,6 @@ eventuelly be set to nil, however)."
|
|||||||
(append auto-mode-alist interpreter-mode-alist)))
|
(append auto-mode-alist interpreter-mode-alist)))
|
||||||
|
|
||||||
(setq cperl-hairy nil
|
(setq cperl-hairy nil
|
||||||
cperl-invalid-face 'default
|
|
||||||
cperl-electric-keywords nil
|
cperl-electric-keywords nil
|
||||||
cperl-lazy-help-time 2
|
cperl-lazy-help-time 2
|
||||||
cperl-highlight-variables-indiscriminately t
|
cperl-highlight-variables-indiscriminately t
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user