[Emacs-diffs] Changes to emacs/src/keymap.c

[Eli Zaretskii]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.253 emacs/src/keymap.c:1.254
*** emacs/src/keymap.c:1.253    Sat Dec 29 09:54:18 2001
--- emacs/src/keymap.c  Thu Jan  3 16:28:04 2002
***************
*** 1347,1361 ****
        if (!NILP (local))
        keymaps = Fcons (local, keymaps);
  
-       local = get_local_map (PT, current_buffer, Qkeymap);
-       if (!NILP (local))
-       keymaps = Fcons (local, keymaps);
- 
        nmaps = current_minor_maps (0, &maps);
  
        for (i = --nmaps; i >= 0; i--)
        if (!NILP (maps[i]))
          keymaps = Fcons (maps[i], keymaps);
      }
    
    return keymaps;
--- 1347,1361 ----
        if (!NILP (local))
        keymaps = Fcons (local, keymaps);
  
        nmaps = current_minor_maps (0, &maps);
  
        for (i = --nmaps; i >= 0; i--)
        if (!NILP (maps[i]))
          keymaps = Fcons (maps[i], keymaps);
+ 
+       local = get_local_map (PT, current_buffer, Qkeymap);
+       if (!NILP (local))
+       keymaps = Fcons (local, keymaps);
      }
    
    return keymaps;
***************
*** 1399,1404 ****
--- 1399,1412 ----
      { 
        Lisp_Object local;
  
+       local = get_local_map (PT, current_buffer, Qkeymap);
+       if (! NILP (local))
+       {
+         value = Flookup_key (local, key, accept_default);
+         if (! NILP (value) && !INTEGERP (value))
+           RETURN_UNGCPRO (value);
+       }
+ 
        nmaps = current_minor_maps (0, &maps);
        /* Note that all these maps are GCPRO'd
         in the places where we found them.  */
***************
*** 1411,1426 ****
              RETURN_UNGCPRO (value);
          }
  
-       local = get_local_map (PT, current_buffer, Qkeymap);
-       if (! NILP (local))
-       {
-         value = Flookup_key (local, key, accept_default);
-         if (! NILP (value) && !INTEGERP (value))
-           RETURN_UNGCPRO (value);
-       }
- 
        local = get_local_map (PT, current_buffer, Qlocal_map);
- 
        if (! NILP (local))
        {
          value = Flookup_key (local, key, accept_default);
--- 1419,1425 ----
***************
*** 2613,2618 ****
--- 2612,2626 ----
        nmaps = current_minor_maps (&modes, &maps);
        Fset_buffer (outbuf);
  
+       start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
+                             XBUFFER (buffer), Qkeymap);
+       if (!NILP (start1))
+       {
+         describe_map_tree (start1, 1, shadow, prefix,
+                            "\f\n`keymap' Property Bindings", nomenu, 0, 0);
+         shadow = Fcons (start1, shadow);
+       }
+ 
        /* Print the minor mode maps.  */
        for (i = 0; i < nmaps; i++)
        {
***************
*** 2642,2656 ****
        }
  
        start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
-                             XBUFFER (buffer), Qkeymap);
-       if (!NILP (start1))
-       {
-         describe_map_tree (start1, 1, shadow, prefix,
-                            "\f\nChar Property Bindings", nomenu, 0, 0);
-         shadow = Fcons (start1, shadow);
-       }
- 
-       start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
                              XBUFFER (buffer), Qlocal_map);
        if (!NILP (start1))
        {
--- 2650,2655 ----
***************
*** 2659,2665 ****
                               "\f\nMajor Mode Bindings", nomenu, 0, 0);
          else
            describe_map_tree (start1, 1, shadow, prefix,
!                              "\f\nChar Property Bindings", nomenu, 0, 0);
  
          shadow = Fcons (start1, shadow);
        }
--- 2658,2665 ----
                               "\f\nMajor Mode Bindings", nomenu, 0, 0);
          else
            describe_map_tree (start1, 1, shadow, prefix,
!                              "\f\n`local-map' Property Bindings",
!                              nomenu, 0, 0);
  
          shadow = Fcons (start1, shadow);
        }