Mercurial > emacs
changeset 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 | 3f2598db97ac |
| children | 00d8427f3adf |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 27 16:50:02 2004 +0000 +++ b/src/ChangeLog Fri Aug 27 16:57:36 2004 +0000 @@ -1,5 +1,8 @@ 2004-08-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + * 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. + * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when tool bar items is 0.
--- a/src/xmenu.c Fri Aug 27 16:50:02 2004 +0000 +++ b/src/xmenu.c Fri Aug 27 16:57:36 2004 +0000 @@ -1930,6 +1930,7 @@ FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); items = FRAME_MENU_BAR_ITEMS (f); + inhibit_garbage_collection (); /* Save the frame's previous menu bar contents data. */ if (previous_menu_items_used)