(menu_bar_items, tool_bar_items)

(current_active_maps): Remove redundant get_local_map call.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc09566d561..e7136f8423a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-18  Dave Love  <fx@gnu.org>
+
+        * keyboard.c (menu_bar_items, tool_bar_items) 
+        (current_active_maps): Remove redundant get_local_map call.
+
 2000-09-18  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (x_draw_image_glyph_string): Remove a comment describing
diff --git a/src/keyboard.c b/src/keyboard.c
index 4ce4bc6e5b8..d204e904a17 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6220,7 +6220,7 @@ menu_bar_items (old)
                                        * sizeof (maps[0]));
         bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
         if (!NILP (map))
-          maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+          maps[nmaps++] = map;
         maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
       }
     maps[nmaps++] = current_global_map;
@@ -6877,7 +6877,7 @@ tool_bar_items (reuse, nitems)
                                      * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))
-        maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+        maps[nmaps++] = map;
       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
 
@@ -9216,7 +9216,7 @@ current_active_maps (maps_p)
                                      * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))
-        maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+        maps[nmaps++] = map;
       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
   maps[nmaps++] = current_global_map;