[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112593: * lisp/isearch.el (minibuffe
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112593: * lisp/isearch.el (minibuffer-local-isearch-map): Bind "\r" to `exit-minibuffer' |
Date: |
Thu, 16 May 2013 02:14:18 +0300 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112593
fixes bug: http://debbugs.gnu.org/13348
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 02:14:18 +0300
message:
* 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.
modified:
doc/emacs/ChangeLog
doc/emacs/search.texi
lisp/ChangeLog
lisp/isearch.el
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2013-05-14 02:04:02 +0000
+++ b/doc/emacs/ChangeLog 2013-05-15 23:14:18 +0000
@@ -1,3 +1,8 @@
+2013-05-15 Juri Linkov <address@hidden>
+
+ * search.texi (Repeat Isearch): Mention key `RET' to finish
+ editing the string. (Bug#13348)
+
2013-05-14 Glenn Morris <address@hidden>
* ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el.
=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi 2013-01-01 09:11:05 +0000
+++ b/doc/emacs/search.texi 2013-05-15 23:14:18 +0000
@@ -175,7 +175,7 @@
@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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-15 20:12:53 +0000
+++ b/lisp/ChangeLog 2013-05-15 23:14:18 +0000
@@ -1,3 +1,14 @@
+2013-05-15 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* loadup.el: Just use unversioned DOC.
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2013-05-01 08:10:12 +0000
+++ b/lisp/isearch.el 2013-05-15 23:14:18 +0000
@@ -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 @@
(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 @@
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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112593: * lisp/isearch.el (minibuffer-local-isearch-map): Bind "\r" to `exit-minibuffer',
Juri Linkov <=