From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 15 Nov 1994 22:54:36 +0000 (+0000)
Subject: (current_minor_maps): Avoid assignments in arguments to a type-test macro.
X-Git-Tag: emacs-19.34~5909
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f56ecfc2f80a691f0e2fac1fb0c2b8ee3c20a29;p=emacs.git

(current_minor_maps): Avoid assignments in arguments to a type-test macro.
---

diff --git a/src/keymap.c b/src/keymap.c
index 2dbf35972a3..d75a10ae13b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -812,9 +812,9 @@ current_minor_maps (modeptr, mapptr)
   for (alist = Vminor_mode_map_alist;
        CONSP (alist);
        alist = XCONS (alist)->cdr)
-    if (CONSP (assoc = XCONS (alist)->car)
-	&& SYMBOLP (var = XCONS (assoc)->car)
-	&& ! EQ ((val = find_symbol_value (var)), Qunbound)
+    if ((assoc = XCONS (alist)->car, CONSP (assoc))
+	&& (var = XCONS (assoc)->car, SYMBOLP (var))
+	&& (val = find_symbol_value (var), ! EQ (val, Qunbound))
 	&& ! NILP (val))
       {
 	if (i >= cmm_size)