Mercurial > emacs
comparison src/xmenu.c @ 56805:27ebdb6b3098
* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Fri, 27 Aug 2004 16:57:36 +0000 |
parents | 5a46a8191136 |
children | 5817080daeba |
comparison
equal
deleted
inserted
replaced
56804:3f2598db97ac | 56805:27ebdb6b3098 |
---|---|
1928 call0 (Qrecompute_lucid_menubar); | 1928 call0 (Qrecompute_lucid_menubar); |
1929 safe_run_hooks (Qmenu_bar_update_hook); | 1929 safe_run_hooks (Qmenu_bar_update_hook); |
1930 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); | 1930 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
1931 | 1931 |
1932 items = FRAME_MENU_BAR_ITEMS (f); | 1932 items = FRAME_MENU_BAR_ITEMS (f); |
1933 inhibit_garbage_collection (); | |
1933 | 1934 |
1934 /* Save the frame's previous menu bar contents data. */ | 1935 /* Save the frame's previous menu bar contents data. */ |
1935 if (previous_menu_items_used) | 1936 if (previous_menu_items_used) |
1936 bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items, | 1937 bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items, |
1937 previous_menu_items_used * sizeof (Lisp_Object)); | 1938 previous_menu_items_used * sizeof (Lisp_Object)); |