Merge from trunk.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03423942f4f..15296e09b46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-29  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-done): Don't display message "Mark saved"
+        when arg `edit' is non-nil to prevent its flicker in the echo area.
+
 2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacs-lisp/package.el (package-menu-mark-delete): Allow marking
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8764952dbf5..6eab3dbcbc4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -952,7 +952,7 @@ NOPUSH is t and EDIT is t."
       (or (and transient-mark-mode mark-active)
           (progn
             (push-mark isearch-opoint t)
-            (or executing-kbd-macro (> (minibuffer-depth) 0)
+            (or executing-kbd-macro (> (minibuffer-depth) 0) edit
                 (message "Mark saved where search started")))))
 
   (and (not edit) isearch-recursive-edit (exit-recursive-edit)))