aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-14 08:40:57 -0700
committerPaul Eggert2011-03-14 08:40:57 -0700
commit1004a21a8f2488da573e0340873cbdeac3ac2001 (patch)
treead30d834e3b9054546c2dc99d61105b6a545661a /src
parent38fc62d95ae8078bedac4a99eb7ea8856f86032e (diff)
downloademacs-1004a21a8f2488da573e0340873cbdeac3ac2001.tar.gz
emacs-1004a21a8f2488da573e0340873cbdeac3ac2001.zip
* keymap.c (Fwhere_is_internal): Don't test CONSP (sequences) unnecessarily.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/keymap.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9f770df40ef..8efad3a59d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
3 * keymap.c (keymap_parent, keymap_memberp, map_keymap_internal): 3 * keymap.c (keymap_parent, keymap_memberp, map_keymap_internal):
4 (copy_keymap_item, append_key, push_text_char_description): 4 (copy_keymap_item, append_key, push_text_char_description):
5 Now static. 5 Now static.
6 (Fwhere_is_internal): Don't test CONSP (sequences) unnecessarily.
6 7
7 * keyboard.c: Declare functions static if they are not used elsewhere. 8 * keyboard.c: Declare functions static if they are not used elsewhere.
8 (echo_char, echo_dash, cmd_error, top_level_2): 9 (echo_char, echo_dash, cmd_error, top_level_2):
diff --git a/src/keymap.c b/src/keymap.c
index cbb6adf3a0b..05d9616ef2d 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2774,8 +2774,8 @@ remapped command in the returned list. */)
2774 considered remapped sequences yet, copy them over and 2774 considered remapped sequences yet, copy them over and
2775 process them. */ 2775 process them. */
2776 || (!remapped && (sequences = remapped_sequences, 2776 || (!remapped && (sequences = remapped_sequences,
2777 remapped = 1), 2777 remapped = 1,
2778 CONSP (sequences))) 2778 CONSP (sequences))))
2779 { 2779 {
2780 Lisp_Object sequence, function; 2780 Lisp_Object sequence, function;
2781 2781