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

* lisp/comint.el (comint-history-isearch-setup): Check if process is live.

Browse source 
Don't activate comint-history isearch when shell prompt is empty
like in all *Async Shell Command* buffers. (Bug#30187)
This commit is contained in:
Juri Linkov 2018-02-06 23:39:00 +02:00
parent 0372233906
commit a710f8aa61
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/comint.el
View file

@ -1448,10 +1448,17 @@ If nil, Isearch operates on the whole comint buffer."
(defun comint-history-isearch-setup ()
"Set up a comint for using Isearch to search the input history.
Intended to be added to `isearch-mode-hook' in `comint-mode'."
(when (or (eq comint-history-isearch t)
(and (eq comint-history-isearch 'dwim)
;; Point is at command line.
(comint-after-pmark-p)))
(when (and (get-buffer-process (current-buffer))
(or (eq comint-history-isearch t)
(and (eq comint-history-isearch 'dwim)
;; Point is at command line.
(comint-after-pmark-p)
;; Prompt is not empty like in Async Shell Command buffers
(not (eq (save-excursion
(goto-char (comint-line-beginning-position))
(forward-line 0)
(point))
(comint-line-beginning-position))))))
(setq isearch-message-prefix-add "history ")
(setq-local isearch-search-fun-function
#'comint-history-isearch-search)