Make :filters run in the correct buffer in describe-buffer-bindings

* lisp/help.el (describe-map-tree): Take an optional buffer parameter.
(describe-map): Ditto, and use it to run `lookup-key' in the
correct buffer.  This fixes problems of filters being run in the
wrong buffer (bug#39149).

* src/keymap.c (Fdescribe_buffer_bindings): Pass in BUFFER to
describe-map-tree.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 83c54e26300..da0a52bd2c1 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2867,7 +2867,7 @@ You type        Translation\n\
       CALLN (Ffuncall,
              Qdescribe_map_tree,
              Vkey_translation_map, Qnil, Qnil, prefix,
-             msg, nomenu, Qt, Qnil, Qnil);
+             msg, nomenu, Qt, Qnil, Qnil, buffer);
     }
 
   /* Print the (major mode) local map.  */
@@ -2881,7 +2881,7 @@ You type        Translation\n\
       CALLN (Ffuncall,
              Qdescribe_map_tree,
              start1, Qt, shadow, prefix,
-             msg, nomenu, Qnil, Qnil, Qnil);
+             msg, nomenu, Qnil, Qnil, Qnil, buffer);
       shadow = Fcons (start1, shadow);
       start1 = Qnil;
     }
@@ -2894,7 +2894,7 @@ You type        Translation\n\
       CALLN (Ffuncall,
              Qdescribe_map_tree,
              start1, Qt, shadow, prefix,
-             msg, nomenu, Qnil, Qnil, Qnil);
+             msg, nomenu, Qnil, Qnil, Qnil, buffer);
       shadow = Fcons (start1, shadow);
     }
   else
@@ -2917,7 +2917,7 @@ You type        Translation\n\
           CALLN (Ffuncall,
                  Qdescribe_map_tree,
                  start1, Qt, shadow, prefix,
-                 msg, nomenu, Qnil, Qnil, Qnil);
+                 msg, nomenu, Qnil, Qnil, Qnil, buffer);
           shadow = Fcons (start1, shadow);
         }
 
@@ -2950,7 +2950,7 @@ You type        Translation\n\
           CALLN (Ffuncall,
                  Qdescribe_map_tree,
                  maps[i], Qt, shadow, prefix,
-                 msg, nomenu, Qnil, Qnil, Qnil);
+                 msg, nomenu, Qnil, Qnil, Qnil, buffer);
           shadow = Fcons (maps[i], shadow);
           SAFE_FREE ();
         }
@@ -2968,7 +2968,7 @@ You type        Translation\n\
               CALLN (Ffuncall,
                      Qdescribe_map_tree,
                      start1, Qt, shadow, prefix,
-                     msg, nomenu, Qnil, Qnil, Qnil);
+                     msg, nomenu, Qnil, Qnil, Qnil, buffer);
             }
           else
             {
@@ -2976,7 +2976,7 @@ You type        Translation\n\
               CALLN (Ffuncall,
                      Qdescribe_map_tree,
                      start1, Qt, shadow, prefix,
-                     msg, nomenu, Qnil, Qnil, Qnil);
+                     msg, nomenu, Qnil, Qnil, Qnil, buffer);
             }
 
           shadow = Fcons (start1, shadow);
@@ -2987,7 +2987,7 @@ You type        Translation\n\
   CALLN (Ffuncall,
          Qdescribe_map_tree,
          current_global_map, Qt, shadow, prefix,
-         msg, nomenu, Qnil, Qt, Qnil);
+         msg, nomenu, Qnil, Qt, Qnil, buffer);
 
   /* Print the function-key-map translations under this prefix.  */
   if (!NILP (KVAR (current_kboard, Vlocal_function_key_map)))
@@ -2996,7 +2996,7 @@ You type        Translation\n\
       CALLN (Ffuncall,
              Qdescribe_map_tree,
              KVAR (current_kboard, Vlocal_function_key_map), Qnil, Qnil, prefix,
-             msg, nomenu, Qt, Qnil, Qnil);
+             msg, nomenu, Qt, Qnil, Qnil, buffer);
     }
 
   /* Print the input-decode-map translations under this prefix.  */
@@ -3006,7 +3006,7 @@ You type        Translation\n\
       CALLN (Ffuncall,
              Qdescribe_map_tree,
              KVAR (current_kboard, Vinput_decode_map), Qnil, Qnil, prefix,
-             msg, nomenu, Qt, Qnil, Qnil);
+             msg, nomenu, Qt, Qnil, Qnil, buffer);
     }
   return Qnil;
 }