aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2006-09-28 19:00:10 +0000
committerStefan Monnier2006-09-28 19:00:10 +0000
commit7ae8428d900662b301d720ee8d3c0d35c4fee077 (patch)
tree4fde026ca4642d033abc1544f0dcb61b95a0f909 /src
parentfa601de5de492eceef93d6c4d76378e4edf0111f (diff)
downloademacs-7ae8428d900662b301d720ee8d3c0d35c4fee077.tar.gz
emacs-7ae8428d900662b301d720ee8d3c0d35c4fee077.zip
(Fdefine_key): Yet another int/Lisp_Object mixup (YAILOM).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f919ffedef..909ea7df2a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-09-28 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * keymap.c (Fdefine_key): Yet another int/Lisp_Object mixup (YAILOM).
4
12006-09-26 Chong Yidong <cyd@stupidchicken.com> 52006-09-26 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * indent.c (Fvertical_motion): Do move back if the Lisp string 7 * indent.c (Fvertical_motion): Do move back if the Lisp string
diff --git a/src/keymap.c b/src/keymap.c
index 9b36ec08b6d..1476859ccd5 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1156,7 +1156,7 @@ binding KEY to DEF is added at the front of KEYMAP. */)
1156 1156
1157 meta_bit = VECTORP (key) ? meta_modifier : 0x80; 1157 meta_bit = VECTORP (key) ? meta_modifier : 0x80;
1158 1158
1159 if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, make_number (0)))) 1159 if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0)))
1160 { /* DEF is apparently an XEmacs-style keyboard macro. */ 1160 { /* DEF is apparently an XEmacs-style keyboard macro. */
1161 Lisp_Object tmp = Fmake_vector (make_number (ASIZE (def)), Qnil); 1161 Lisp_Object tmp = Fmake_vector (make_number (ASIZE (def)), Qnil);
1162 int i = ASIZE (def); 1162 int i = ASIZE (def);