aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-02-08 16:23:19 +0000
committerStefan Monnier2008-02-08 16:23:19 +0000
commit9141ca5e7dd56c6ac375fd41238dfd6e9683917b (patch)
treeec5ad46ac8b8682dd956a9338f21f133d7be5bb7
parentb1ebcadbe27ce4027e8eb836ddd9fa318668d678 (diff)
downloademacs-9141ca5e7dd56c6ac375fd41238dfd6e9683917b.tar.gz
emacs-9141ca5e7dd56c6ac375fd41238dfd6e9683917b.zip
(Fkey_description): Move side effect outside of macro call.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/keymap.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6e7b6239148..516e1b46961 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-02-08 Stefan Monnier <monnier@iro.umontreal.ca> 12008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * keymap.c (Fkey_description): Move side effect outside of macro call.
4
3 * keyboard.c (add_command_key, parse_menu_item): Use ASET. 5 * keyboard.c (add_command_key, parse_menu_item): Use ASET.
4 6
5 * fontset.c (free_face_fontset): Use FONTSET_FROM_ID. 7 * fontset.c (free_face_fontset): Use FONTSET_FROM_ID.
diff --git a/src/keymap.c b/src/keymap.c
index 1cb481fc050..e91df88aaff 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2304,7 +2304,7 @@ spaces are put between sequence elements, etc. */)
2304 } 2304 }
2305 else if (VECTORP (list)) 2305 else if (VECTORP (list))
2306 { 2306 {
2307 key = AREF (list, i++); 2307 key = AREF (list, i); i++;
2308 } 2308 }
2309 else 2309 else
2310 { 2310 {