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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/07/09 14:46:36

Index: isearch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.297
retrieving revision 1.297.2.1
diff -u -b -r1.297 -r1.297.2.1
--- isearch.el  6 Apr 2007 18:27:43 -0000       1.297
+++ isearch.el  9 Jul 2007 14:46:36 -0000       1.297.2.1
@@ -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 @@
       (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 @@
       (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 @@
 
        ;; Reinvoke the pending search.
        (isearch-search)
+       (isearch-push-state)
        (isearch-update)
        (if isearch-nonincremental
            (progn