(isearch-done): Use FOUND-POINT or FOUND-START

only if we restored isearch-window-configuration.

2 files changed, 14 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cd2f794e5f..ebe0dc9b668 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-01  Richard Stallman  <rms@gnu.org>
+
+        * isearch.el (isearch-done): Use FOUND-POINT or FOUND-START
+        only if we restored isearch-window-configuration.
+
 2006-12-31  Romain Francoise  <romain@orebokech.com>
 
         * net/tramp.el (tramp-default-method): Don't use `symbol-function'.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a7d239aebc2..ca569eeff16 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -784,13 +784,15 @@ NOPUSH is t and EDIT is t."
   (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))
-
-    (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)))
+    (when isearch-window-configuration
+      (set-window-configuration isearch-window-configuration)
+      (if isearch-small-window
+          (goto-char found-point)
+        ;; 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