[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115555: * lisp/isearch.el (isearch-mode-map): Remov
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r115555: * lisp/isearch.el (isearch-mode-map): Remove [escape] key bindinds. |
Date: |
Mon, 16 Dec 2013 20:32:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115555
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16035
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-16 22:32:15 +0200
message:
* lisp/isearch.el (isearch-mode-map): Remove [escape] key bindinds.
(isearch-pre-command-hook): Check `this-command' for symbolp.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/isearch.el isearch.el-20091113204419-o5vbwnq5f7feedwu-486
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-16 19:12:21 +0000
+++ b/lisp/ChangeLog 2013-12-16 20:32:15 +0000
@@ -1,3 +1,9 @@
+2013-12-16 Juri Linkov <address@hidden>
+
+ * isearch.el (isearch-mode-map): Remove [escape] key bindinds.
+ (Bug#16035)
+ (isearch-pre-command-hook): Check `this-command' for symbolp.
+
2013-12-16 Stefan Monnier <address@hidden>
* emacs-lisp/gv.el (gv-ref): Mention lexbind restriction (bug#16153).
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2013-12-06 00:55:20 +0000
+++ b/lisp/isearch.el 2013-12-16 20:32:15 +0000
@@ -435,8 +435,7 @@
;; would be simpler to disable the global keymap, and/or have a
;; default local key binding for any key not otherwise bound.
(let ((meta-map (make-sparse-keymap)))
- (define-key map (char-to-string meta-prefix-char) meta-map)
- (define-key map [escape] meta-map))
+ (define-key map (char-to-string meta-prefix-char) meta-map))
;; Several non-printing chars change the searching behavior.
(define-key map "\C-s" 'isearch-repeat-forward)
@@ -453,7 +452,6 @@
(or (= ?\e meta-prefix-char)
(error "Inconsistency in isearch.el"))
(define-key map "\e\e\e" 'isearch-cancel)
- (define-key map [escape escape escape] 'isearch-cancel)
(define-key map "\C-q" 'isearch-quote-char)
@@ -2251,6 +2249,7 @@
(memq this-command '(universal-argument
digit-argument negative-argument)))
(and isearch-allow-scroll
+ (symbolp this-command)
(or (eq (get this-command 'isearch-scroll) t)
(eq (get this-command 'scroll-command) t))))
(when isearch-allow-scroll
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115555: * lisp/isearch.el (isearch-mode-map): Remove [escape] key bindinds.,
Juri Linkov <=