1 files changed, 3 insertions, 3 deletions

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)