diff lisp/comint.el @ 106485:85eebb6799d7

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.
author Juri Linkov <juri@jurta.org>
date Mon, 07 Dec 2009 22:36:58 +0000
parents d19d1b12196e
children 4d6afab8b7cb
line wrap: on
line diff
--- a/lisp/comint.el	Mon Dec 07 21:15:19 2009 +0000
+++ b/lisp/comint.el	Mon Dec 07 22:36:58 2009 +0000
@@ -1422,11 +1422,11 @@
               (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