aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJuri Linkov2013-05-16 02:14:18 +0300
committerJuri Linkov2013-05-16 02:14:18 +0300
commit6d65486d647049cbf33524e261bbd891dd28daba (patch)
tree962c723d0a092355ecc44de1dd1679ee97341ad8 /doc
parent6e911150d00fa20c60b91d51aafd2cfd81e1c349 (diff)
downloademacs-6d65486d647049cbf33524e261bbd891dd28daba.tar.gz
emacs-6d65486d647049cbf33524e261bbd891dd28daba.zip
* 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.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/search.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 1d72ba18860..14e9be8ba84 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12013-05-15 Juri Linkov <juri@jurta.org>
2
3 * search.texi (Repeat Isearch): Mention key `RET' to finish
4 editing the string. (Bug#13348)
5
12013-05-14 Glenn Morris <rgm@gnu.org> 62013-05-14 Glenn Morris <rgm@gnu.org>
2 7
3 * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. 8 * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el.
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 377264223a5..e146177255e 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -175,7 +175,7 @@ element in the minibuffer, where you can edit it.
175 175
176@kindex M-e @r{(Incremental search)} 176@kindex M-e @r{(Incremental search)}
177 To edit the current search string in the minibuffer without 177 To edit the current search string in the minibuffer without
178replacing it with items from the search ring, type @kbd{M-e}. Type 178replacing it with items from the search ring, type @kbd{M-e}. Type @key{RET},
179@kbd{C-s} or @kbd{C-r} to finish editing the string and search for it. 179@kbd{C-s} or @kbd{C-r} to finish editing the string and search for it.
180 180
181@node Error in Isearch 181@node Error in Isearch