From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 14 Mar 2011 15:40:57 +0000 (-0700)
Subject: * keymap.c (Fwhere_is_internal): Don't test CONSP (sequences) unnecessarily.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1004a21a8f2488da573e0340873cbdeac3ac2001;p=emacs.git

* keymap.c (Fwhere_is_internal): Don't test CONSP (sequences) unnecessarily.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f770df40ef..8efad3a59d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
 	* keymap.c (keymap_parent, keymap_memberp, map_keymap_internal):
 	(copy_keymap_item, append_key, push_text_char_description):
 	Now static.
+	(Fwhere_is_internal): Don't test CONSP (sequences) unnecessarily.
 
 	* keyboard.c: Declare functions static if they are not used elsewhere.
 	(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.  */)
 	    considered remapped sequences yet, copy them over and
 	    process them.  */
 	 || (!remapped && (sequences = remapped_sequences,
-			   remapped = 1),
-	     CONSP (sequences)))
+			   remapped = 1,
+			   CONSP (sequences))))
     {
       Lisp_Object sequence, function;