From: Dave Love Date: Mon, 18 Sep 2000 18:45:34 +0000 (+0000) Subject: (menu_bar_items, tool_bar_items) X-Git-Tag: emacs-pretest-21.0.90~1539 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f83cf0bd0b2489ede411a398d5efaccc5f952c2;p=emacs.git (menu_bar_items, tool_bar_items) (current_active_maps): Remove redundant get_local_map call. --- 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 + + * keyboard.c (menu_bar_items, tool_bar_items) + (current_active_maps): Remove redundant get_local_map call. + 2000-09-18 Gerd Moellmann * 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;