(isearch-edit-string): Call to isearch-push-state after the search.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d56fe6..87e4717 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-09  Richard Stallman  <rms@gnu.org>
+
+       * isearch.el (isearch-edit-string): Call to isearch-push-state
+       after the search.
+
 2007-07-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * cus-start.el (file-coding-system-alist): Fix custom type.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index f5a0632..770d607 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,4 +1,4 @@
-;;; isearch.el --- incremental search minor mode
+----------;;; isearch.el --- incremental search minor mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
 ;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -674,6 +674,8 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
       (make-local-variable 'input-method-function))
   (setq input-method-function nil)
 
+  (setq cursor-in-echo-area t)
+
   (looking-at "")
   (setq isearch-window-configuration
        (if isearch-slow-terminal-mode (current-window-configuration) nil))
@@ -798,6 +800,8 @@ NOPUSH is t and EDIT is t."
       (setq input-method-function isearch-input-method-function)
     (kill-local-variable 'input-method-function))
 
+  (setq cursor-in-echo-area nil)
+
   (force-mode-line-update)
 
   ;; If we ended in the middle of some intangible text,
@@ -1069,6 +1073,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
 
        ;; Reinvoke the pending search.
        (isearch-search)
+       (isearch-push-state)
        (isearch-update)
        (if isearch-nonincremental
            (progn