aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-07-15 18:45:59 +0000
committerRichard M. Stallman2007-07-15 18:45:59 +0000
commitbe3eb6a6229303ee2d95ffe3942f07a46fb925a3 (patch)
tree55e8acf057985780af1250052f38e899c9f0f215
parent0e01e4afb99f8d278de0fea3270649e7ab46d652 (diff)
downloademacs-be3eb6a6229303ee2d95ffe3942f07a46fb925a3.tar.gz
emacs-be3eb6a6229303ee2d95ffe3942f07a46fb925a3.zip
(kmacro-bind-to-key): Avoid comparisons on function keys.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/kmacro.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 322c00b6660..3631cccab7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12007-07-15 Richard Stallman <rms@gnu.org> 12007-07-15 Richard Stallman <rms@gnu.org>
2 2
3 * kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.
4
3 * tutorial.el (tutorial--find-changed-keys): 5 * tutorial.el (tutorial--find-changed-keys):
4 Handle C-x specially like ESC. 6 Handle C-x specially like ESC.
5 7
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index bfc0edba2c1..4dc06a4ada3 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -795,8 +795,9 @@ may be shaded by a local key binding."
795 ok cmd) 795 ok cmd)
796 (when (= (length key-seq) 1) 796 (when (= (length key-seq) 1)
797 (let ((ch (aref key-seq 0))) 797 (let ((ch (aref key-seq 0)))
798 (if (or (and (>= ch ?0) (<= ch ?9)) 798 (if (and (integerp ch)
799 (and (>= ch ?A) (<= ch ?Z))) 799 (or (and (>= ch ?0) (<= ch ?9))
800 (and (>= ch ?A) (<= ch ?Z))))
800 (setq key-seq (concat "\C-x\C-k" key-seq) 801 (setq key-seq (concat "\C-x\C-k" key-seq)
801 ok t)))) 802 ok t))))
802 (when (and (not (equal key-seq "")) 803 (when (and (not (equal key-seq ""))