diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-29 23:19:35 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-29 23:19:35 -0700 |
commit | f00b626d886d32b08aa6fb47e1cee124c1926897 (patch) | |
tree | 0a59d9093e02dea55a0aca750cd5059231196e33 /lisp/isearch.el | |
parent | 6e1a67fbe915e6fdc1d63a8e6c434aa79e4e7fb4 (diff) | |
parent | 393aa9d403dda96b2fa061311cc76bbad40489cf (diff) | |
download | emacs-f00b626d886d32b08aa6fb47e1cee124c1926897.tar.gz emacs-f00b626d886d32b08aa6fb47e1cee124c1926897.tar.bz2 emacs-f00b626d886d32b08aa6fb47e1cee124c1926897.zip |
Merge from trunk.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r-- | lisp/isearch.el | 2 |
1 files changed, 1 insertions, 1 deletions
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))) |