aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-08-27 16:57:36 +0000
committerJan Djärv2004-08-27 16:57:36 +0000
commit059cd32943b2598a756c7826d177e55679836a8d (patch)
tree966d69dd5d1d93cd697d19b7383fb4cd75063c83 /src
parent5500be54e134938c0fd50c6a629fc7b7f84d9d21 (diff)
downloademacs-059cd32943b2598a756c7826d177e55679836a8d.tar.gz
emacs-059cd32943b2598a756c7826d177e55679836a8d.zip
* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
from 2002-07-15T00:01:34Z!raeburn@raeburn.org so that strings from ENCODE_UTF_8 isn't GC:ed before used.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xmenu.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fd12877d2ce..7779dddb124 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12004-08-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12004-08-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
4 from 2002-07-15T00:01:34Z!raeburn@raeburn.org so that strings from ENCODE_UTF_8 isn't GC:ed before used.
5
3 * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when 6 * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
4 tool bar items is 0. 7 tool bar items is 0.
5 8
diff --git a/src/xmenu.c b/src/xmenu.c
index 473e29de88d..7ef0e8c857d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1930,6 +1930,7 @@ set_frame_menubar (f, first_time, deep_p)
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)