2 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4045f553629..714a21a1a1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)
diff --git a/lisp/comint.el b/lisp/comint.el
index 92bfe24373f..c4dc3654554 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -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