mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

Don't lazy-highlight the comint output in history Isearch mode.

Browse Source 
* comint.el (comint-history-isearch-search): Instead of
`comint-line-beginning-position', use `comint-after-pmark-p'
to check if point if before the process mark, and go to
`process-mark' in this case.
This commit is contained in:
Juri Linkov 2009-12-07 22:36:58 +00:00
parent fb10ee4af9
commit d2a1dc7bc1
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -1,3 +1,12 @@
2009-12-07 Juri Linkov <juri@jurta.org>
Don't lazy-highlight the comint output in history Isearch mode.
* comint.el (comint-history-isearch-search): Instead of
`comint-line-beginning-position', use `comint-after-pmark-p'
to check if point if before the process mark, and go to
`process-mark' in this case.
2009-12-07 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/tex-mode.el (latex-complete)

10
lisp/comint.el
View File

@ -1422,11 +1422,11 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
(t
(if isearch-forward 'search-forward 'search-backward))))
found)
;; Avoid lazy-highlighting matches in the comint prompt when
;; searching forward. Lazy-highlight calls this lambda with the
;; bound arg, so skip the comint prompt.
(if (and bound isearch-forward (< (point) (comint-line-beginning-position)))
(goto-char (comint-line-beginning-position)))
;; Avoid lazy-highlighting matches in the comint prompt and in the
;; output when searching forward. Lazy-highlight calls this lambda
;; with the bound arg, so skip the prompt and the output.
(if (and bound isearch-forward (not (comint-after-pmark-p)))
(goto-char (process-mark (get-buffer-process (current-buffer)))))
(or
;; 1. First try searching in the initial comint text
(funcall search-fun string