* lisp/isearch.el (minibuffer-local-isearch-map): Bind "\r" to `exit-minibuffer'

instead of `isearch-nonincremental-exit-minibuffer'.
(isearch-edit-string): Remove mention of
`isearch-nonincremental-exit-minibuffer' from docstring.
(isearch-nonincremental-exit-minibuffer): Mark as obsolete.
(isearch-forward-exit-minibuffer)
(isearch-reverse-exit-minibuffer): Add docstring.  (Bug#13348)

* doc/emacs/search.texi (Repeat Isearch): Mention key `RET' to finish
editing the string.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 1d72ba18860997f000fc410c634a316e62dc5b2a..14e9be8ba84828d609f9b25aa9575ac1d1e56f6c 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-15  Juri Linkov  <juri@jurta.org>
+
+       * search.texi (Repeat Isearch): Mention key `RET' to finish
+       editing the string.  (Bug#13348)
+
 2013-05-14  Glenn Morris  <rgm@gnu.org>
 
        * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el.

diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 377264223a58f5080492cfbf037ed8fbd5669a8f..e146177255e026a5a4e1c2cbf95a6ea2a41dca01 100644 (file)
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -175,7 +175,7 @@ element in the minibuffer, where you can edit it.
 
 @kindex M-e @r{(Incremental search)}
   To edit the current search string in the minibuffer without
-replacing it with items from the search ring, type @kbd{M-e}.  Type
+replacing it with items from the search ring, type @kbd{M-e}.  Type @key{RET},
 @kbd{C-s} or @kbd{C-r} to finish editing the string and search for it.
 
 @node Error in Isearch

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b96d830e8073beba7d14b2176937d9dde0ac04b7..070d2f1bd37bba0dd27fe79b53928b5fd48ed8d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2013-05-15  Juri Linkov  <juri@jurta.org>
+
+       * isearch.el (minibuffer-local-isearch-map): Bind "\r" to
+       `exit-minibuffer' instead of
+       `isearch-nonincremental-exit-minibuffer'.
+       (isearch-edit-string): Remove mention of
+       `isearch-nonincremental-exit-minibuffer' from docstring.
+       (isearch-nonincremental-exit-minibuffer): Mark as obsolete.
+       (isearch-forward-exit-minibuffer)
+       (isearch-reverse-exit-minibuffer): Add docstring.  (Bug#13348)
+
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * loadup.el: Just use unversioned DOC.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 72a125fcecbaee36f0dff53961f7d05a3d3f71f6..04fd594e7f15d9ae2772f1103bbf492193899efb 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -47,7 +47,7 @@
 ;; modify the search string before executing the search.  There are
 ;; three commands to terminate the editing: C-s and C-r exit the
 ;; minibuffer and search forward and reverse respectively, while C-m
-;; exits and does a nonincremental search.
+;; exits and searches in the last search direction.
 
 ;; Exiting immediately from isearch uses isearch-edit-string instead
 ;; of nonincremental-search, if search-nonincremental-instead is non-nil.
@@ -528,7 +528,7 @@ This is like `describe-bindings', but displays only Isearch keys."
 (defvar minibuffer-local-isearch-map
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map minibuffer-local-map)
-    (define-key map "\r"    'isearch-nonincremental-exit-minibuffer)
+    (define-key map "\r"    'exit-minibuffer)
     (define-key map "\M-\t" 'isearch-complete-edit)
     (define-key map "\C-s"  'isearch-forward-exit-minibuffer)
     (define-key map "\C-r"  'isearch-reverse-exit-minibuffer)
@@ -1273,7 +1273,6 @@ You can update the global isearch variables by setting new values to
 The following additional command keys are active while editing.
 \\<minibuffer-local-isearch-map>
 \\[exit-minibuffer] to resume incremental searching with the edited string.
-\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
 \\[isearch-forward-exit-minibuffer] to resume isearching forward.
 \\[isearch-reverse-exit-minibuffer] to resume isearching backward.
 \\[isearch-complete-edit] to complete the search string using the search ring."
@@ -1307,13 +1306,18 @@ The following additional command keys are active while editing.
   (interactive)
   (setq isearch-nonincremental t)
   (exit-minibuffer))
+;; Changing the value of `isearch-nonincremental' has no effect here,
+;; because `isearch-edit-string' ignores this change.  Thus marked as obsolete.
+(make-obsolete 'isearch-nonincremental-exit-minibuffer 'exit-minibuffer "24.4")
 
 (defun isearch-forward-exit-minibuffer ()
+  "Resume isearching forward from the minibuffer that edits the search string."
   (interactive)
   (setq isearch-new-forward t)
   (exit-minibuffer))
 
 (defun isearch-reverse-exit-minibuffer ()
+  "Resume isearching backward from the minibuffer that edits the search string."
   (interactive)
   (setq isearch-new-forward nil)
   (exit-minibuffer))