mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

(menu_bar_items): Don't GCPRO menu_bar_items_vector here.

Browse Source 
(syms_of_keyboard): Initialize and staticpro menu_bar_items_vector.
This commit is contained in:
Kim F. Storm 2005-07-08 14:48:03 +00:00
parent 64af59176a
commit 7320c7deb0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/keyboard.c
View File

@ -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);