(Fcurrent_active_maps): Put the `keymap' property map first.

(Fkey_binding): Try the `keymap' property map first.
(Fdescribe_buffer_bindings): Show `keymap' property bindings before
minor mode bindings.

2 files changed, 30 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 05fab464fb8..4bad3889f74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-03  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (Fcurrent_active_maps): Put the `keymap' property map first.
+        (Fkey_binding): Try the `keymap' property map first.
+        (Fdescribe_buffer_bindings): Show `keymap' property bindings before
+        minor mode bindings.
+
 2002-01-03  Kim F. Storm  <storm@cua.dk>
 
         * keyboard.c (read_key_sequence): Fixed cast of submaps arg to bcopy.
diff --git a/src/keymap.c b/src/keymap.c
index a6867db32c0..362f022b100 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1347,15 +1347,15 @@ OLP if non-nil indicates that we should obey `overriding-local-map' and
       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);
+
+      local = get_local_map (PT, current_buffer, Qkeymap);
+      if (!NILP (local))
+        keymaps = Fcons (local, keymaps);
     }
   
   return keymaps;
@@ -1399,6 +1399,14 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
     { 
       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,16 +1419,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
               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);
@@ -2613,6 +2612,15 @@ You type        Translation\n\
       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,15 +2650,6 @@ You type        Translation\n\
         }
 
       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))
         {
@@ -2659,7 +2658,8 @@ You type        Translation\n\
                                "\f\nMajor Mode Bindings", nomenu, 0, 0);
           else
             describe_map_tree (start1, 1, shadow, prefix,
-                               "\f\nChar Property Bindings", nomenu, 0, 0);
+                               "\f\n`local-map' Property Bindings",
+                               nomenu, 0, 0);
 
           shadow = Fcons (start1, shadow);
         }