[Emacs-diffs] emacs/lisp ChangeLog comint.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/12/07 22:37:02

Modified files:
        lisp           : ChangeLog comint.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16863&r2=1.16864
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/comint.el?cvsroot=emacs&r1=1.402&r2=1.403

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16863
retrieving revision 1.16864
diff -u -b -r1.16863 -r1.16864
--- ChangeLog   7 Dec 2009 21:15:19 -0000       1.16863
+++ ChangeLog   7 Dec 2009 22:36:58 -0000       1.16864
@@ -1,3 +1,12 @@
+2009-12-07  Juri Linkov  <address@hidden>
+
+       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  <address@hidden>
 
        * textmodes/tex-mode.el (latex-complete)

Index: comint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/comint.el,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -b -r1.402 -r1.403
--- comint.el   1 Dec 2009 20:32:00 -0000       1.402
+++ comint.el   7 Dec 2009 22:37:01 -0000       1.403
@@ -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