[Emacs-diffs] Changes to emacs/lisp/isearch.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/01/01 21:48:59

Index: isearch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- isearch.el  3 Oct 2006 14:03:46 -0000       1.291
+++ isearch.el  1 Jan 2007 21:48:59 -0000       1.292
@@ -784,13 +784,15 @@
   (lazy-highlight-cleanup lazy-highlight-cleanup)
   (let ((found-start (window-start (selected-window)))
        (found-point (point)))
-    (if isearch-window-configuration
-       (set-window-configuration isearch-window-configuration))
-
+    (when isearch-window-configuration
+      (set-window-configuration isearch-window-configuration)
     (if isearch-small-window
        (goto-char found-point)
-      ;; Exiting the save-window-excursion clobbers window-start; restore it.
-      (set-window-start (selected-window) found-start t)))
+       ;; set-window-configuration clobbers window-start; restore it.
+       ;; This has an annoying side effect of clearing the last_modiff
+       ;; field of the window, which can cause unwanted scrolling,
+       ;; so don't do it unless truly necessary.
+       (set-window-start (selected-window) found-start t))))
 
   (setq isearch-mode nil)
   (if isearch-input-method-local-p