summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2007-07-15 18:45:59 +0000
committerRichard M. Stallman <rms@gnu.org>2007-07-15 18:45:59 +0000
commitbe3eb6a6229303ee2d95ffe3942f07a46fb925a3 (patch)
tree55e8acf057985780af1250052f38e899c9f0f215 /lisp
parent0e01e4afb99f8d278de0fea3270649e7ab46d652 (diff)
(kmacro-bind-to-key): Avoid comparisons on function keys.
Diffstat (limited to 'lisp')
-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 322c00b666..3631cccab7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2007-07-15 Richard Stallman <rms@gnu.org>
+ * kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.
+
* tutorial.el (tutorial--find-changed-keys):
Handle C-x specially like ESC.
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index bfc0edba2c..4dc06a4ada 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -795,8 +795,9 @@ may be shaded by a local key binding."
ok cmd)
(when (= (length key-seq) 1)
(let ((ch (aref key-seq 0)))
- (if (or (and (>= ch ?0) (<= ch ?9))
- (and (>= ch ?A) (<= ch ?Z)))
+ (if (and (integerp ch)
+ (or (and (>= ch ?0) (<= ch ?9))
+ (and (>= ch ?A) (<= ch ?Z))))
(setq key-seq (concat "\C-x\C-k" key-seq)
ok t))))
(when (and (not (equal key-seq ""))