Commit 6d65486d authored by Juri Linkov's avatar Juri Linkov
Browse files

* 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.
parent 6e911150
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.
......
......@@ -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
......
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.
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment