From 7320c7deb098807c2297128ba39738785ec11a14 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 8 Jul 2005 14:48:03 +0000 Subject: [PATCH] (menu_bar_items): Don't GCPRO menu_bar_items_vector here. (syms_of_keyboard): Initialize and staticpro menu_bar_items_vector. --- src/keyboard.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index 88cc0badd2b..e0db002ea94 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6917,8 +6917,6 @@ menu_bar_items (old) int i; - struct gcpro gcpro1; - /* In order to build the menus, we need to call the keymap accessors. They all call QUIT. But this function is called during redisplay, during which a quit is fatal. So inhibit @@ -6934,8 +6932,6 @@ menu_bar_items (old) menu_bar_items_vector = Fmake_vector (make_number (24), Qnil); menu_bar_items_index = 0; - GCPRO1 (menu_bar_items_vector); - /* Build our list of keymaps. If we recognize a function key and replace its escape sequence in keybuf with its symbol, or if the sequence starts with a mouse @@ -7039,7 +7035,6 @@ menu_bar_items (old) menu_bar_items_index = i; Vinhibit_quit = oquit; - UNGCPRO; return menu_bar_items_vector; } @@ -11011,6 +11006,9 @@ syms_of_keyboard () menu_bar_one_keymap_changed_items = Qnil; staticpro (&menu_bar_one_keymap_changed_items); + menu_bar_items_vector = Qnil; + staticpro (&menu_bar_items_vector); + defsubr (&Sevent_convert_list); defsubr (&Sread_key_sequence); defsubr (&Sread_key_sequence_vector); -- 2.39.2