procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not call custom-reevaluate-setting in comint.el (bug#74287)

Browse source 
* lisp/comint.el (comint--force-history-isearch): New internal variable.
(comint-history-isearch-backward, comint-history-isearch-backward-regexp):
Set comint--force-history-isearch to t.
(comint-history-isearch-setup): Check comint--force-history-isearch.
(comint-history-isearch-end): Set comint--force-history-isearch back to nil
instead of calling custom-reevaluate-setting.
This commit is contained in:
Pengji Zhang 2024-12-11 09:05:09 +02:00 • committed by Juri Linkov
parent 10e49d7fae
commit 5db9471453
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/comint.el
View file

@ -1538,16 +1538,20 @@ If nil, Isearch operates on the whole comint buffer."
:group 'comint
:version "23.2")
(defvar comint--force-history-isearch nil
"Non-nil means to force searching in input history.
If nil, respect the option `comint-history-isearch'.")
(defun comint-history-isearch-backward ()
"Search for a string backward in input history using Isearch."
(interactive nil comint-mode)
(setq comint-history-isearch t)
(setq comint--force-history-isearch t)
(isearch-backward nil t))
(defun comint-history-isearch-backward-regexp ()
"Search for a regular expression backward in input history using Isearch."
(interactive nil comint-mode)
(setq comint-history-isearch t)
(setq comint--force-history-isearch t)
(isearch-backward-regexp nil t))
(defvar-local comint-history-isearch-message-overlay nil)
@ -1563,7 +1567,8 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
(forward-line 0)
(point))
(comint-line-beginning-position)))
(or (eq comint-history-isearch t)
(or comint--force-history-isearch
(eq comint-history-isearch t)
(and (eq comint-history-isearch 'dwim)
;; Point is at command line.
(comint-after-pmark-p))))
@ -1593,7 +1598,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
(kill-local-variable 'isearch-lazy-count)
(remove-hook 'isearch-mode-end-hook 'comint-history-isearch-end t)
(unless isearch-suspended
(custom-reevaluate-setting 'comint-history-isearch)))
(setq comint--force-history-isearch nil)))
(defun comint-goto-input (pos)
"Put input history item of the absolute history position POS."