]> git.eshelyaron.com Git - emacs.git/commitdiff
(current_minor_maps):
authorRichard M. Stallman <rms@gnu.org>
Fri, 2 Jan 1998 23:37:19 +0000 (23:37 +0000)
committerRichard M. Stallman <rms@gnu.org>
Fri, 2 Jan 1998 23:37:19 +0000 (23:37 +0000)
If a variable has an entry in Vminor_mode_overriding_map_alist,
and also an entry in Vminor_mode_map_alist, ignore the latter.

src/keymap.c

index 0ba367d29f82c59c9d2a92c49667474a282c1da7..4137de08a5742cb4f3eb13a8e4cb44ff41f4d7f0 100644 (file)
@@ -1077,6 +1077,16 @@ current_minor_maps (modeptr, mapptr)
        {
          Lisp_Object temp;
 
+         /* If a variable has an entry in Vminor_mode_overriding_map_alist,
+            and also an entry in Vminor_mode_map_alist,
+            ignore the latter.  */
+         if (list_number == 1)
+           {
+             val = assq_no_quit (var, lists[0]);
+             if (!NILP (val))
+               break;
+           }
+
          if (i >= cmm_size)
            {
              Lisp_Object *newmodes, *newmaps;