Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.831 emacs/src/keyboard.c:1.832
*** emacs/src/keyboard.c:1.831 Mon Jul 4 16:06:31 2005
--- emacs/src/keyboard.c Fri Jul 8 14:48:03 2005
***************
*** 6917,6924 ****
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
--- 6917,6922 ----
***************
*** 6934,6941 ****
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
--- 6932,6937 ----
***************
*** 7039,7045 ****
menu_bar_items_index = i;
Vinhibit_quit = oquit;
- UNGCPRO;
return menu_bar_items_vector;
}
--- 7035,7040 ----
***************
*** 11011,11016 ****
--- 11006,11014 ----
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);
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
