[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114599: * lisp/isearch.el (isearch-pre-command-hook
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r114599: * lisp/isearch.el (isearch-pre-command-hook): Use this-single-command-keys |
Date: |
Wed, 09 Oct 2013 23:52:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114599
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15568
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 02:52:46 +0300
message:
* lisp/isearch.el (isearch-pre-command-hook): Use this-single-command-keys
instead of this-command-keys. Add universal-argument-more and
universal-argument-minus to the list of prefix commands.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/isearch.el isearch.el-20091113204419-o5vbwnq5f7feedwu-486
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-09 18:49:32 +0000
+++ b/lisp/ChangeLog 2013-10-09 23:52:46 +0000
@@ -1,3 +1,9 @@
+2013-10-09 Juri Linkov <address@hidden>
+
+ * isearch.el (isearch-pre-command-hook): Use this-single-command-keys
+ instead of this-command-keys. Add universal-argument-more and
+ universal-argument-minus to the list of prefix commands. (Bug#15568)
+
2013-10-09 Glenn Morris <address@hidden>
* vc/vc-svn.el (vc-svn-create-repo):
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2013-10-08 23:20:12 +0000
+++ b/lisp/isearch.el 2013-10-09 23:52:46 +0000
@@ -2230,11 +2230,10 @@
or it is a scrolling command (when `isearch-allow-scroll' is non-nil).
Otherwise, exit Isearch (when `search-exit-option' is non-nil)
before the command is executed globally with terminated Isearch."
- (let* ((key (this-command-keys))
+ (let* ((key (this-single-command-keys))
(main-event (aref key 0)))
(cond
;; Don't exit Isearch for isearch key bindings.
- ;; FIXME: remove prefix arg to lookup key without prefix.
((commandp (lookup-key isearch-mode-map key nil)))
;; Optionally edit the search string instead of exiting.
((eq search-exit-option 'edit)
@@ -2242,8 +2241,9 @@
;; Handle a scrolling function or prefix argument.
((or (and isearch-allow-prefix
(memq this-command '(universal-argument
- negative-argument
- digit-argument)))
+ universal-argument-more
+ universal-argument-minus
+ digit-argument negative-argument)))
(and isearch-allow-scroll
(or (eq (get this-command 'isearch-scroll) t)
(eq (get this-command 'scroll-command) t))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114599: * lisp/isearch.el (isearch-pre-command-hook): Use this-single-command-keys,
Juri Linkov <=