aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-11-04 03:21:40 +0000
committerChong Yidong2006-11-04 03:21:40 +0000
commit8630721ec93c38b9ddacfe2a529e69ec10400eef (patch)
tree0ecb4e32fc3440525483816da95afec2aec9c4ec
parentffbdf67b4c0bff0616b65d5365dc43a07f5d3f72 (diff)
downloademacs-8630721ec93c38b9ddacfe2a529e69ec10400eef.tar.gz
emacs-8630721ec93c38b9ddacfe2a529e69ec10400eef.zip
* xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
avoid gcc 2.95 error.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xmenu.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0d6f6838e8e..94e1e02f7f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-11-03 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
2
3 * xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
4 avoid gcc 2.95 error.
5
12006-11-03 Chong Yidong <cyd@stupidchicken.com> 62006-11-03 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * gtkutil.c (update_frame_tool_bar): If icon image is invalid and 8 * gtkutil.c (update_frame_tool_bar): If icon image is invalid and
diff --git a/src/xmenu.c b/src/xmenu.c
index d049fb99c66..7c397fbd6e1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1395,8 +1395,10 @@ If FRAME is nil or not given, use the selected frame. */)
1395 Lisp_Object frame; 1395 Lisp_Object frame;
1396{ 1396{
1397 GtkWidget *menubar; 1397 GtkWidget *menubar;
1398 FRAME_PTR f;
1399
1398 BLOCK_INPUT; 1400 BLOCK_INPUT;
1399 FRAME_PTR f = check_x_frame (frame); 1401 f = check_x_frame (frame);
1400 1402
1401 if (FRAME_EXTERNAL_MENU_BAR (f)) 1403 if (FRAME_EXTERNAL_MENU_BAR (f))
1402 set_frame_menubar (f, 0, 1); 1404 set_frame_menubar (f, 0, 1);