aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-30 19:25:08 +0300
committerEli Zaretskii2013-09-30 19:25:08 +0300
commit6509f7727e1077ab60e24c3f077ff06c3cadb2d5 (patch)
tree897f1b7a4e1be422017e0ec9fe8ec7343e3e616e /src/window.c
parentbdaed46f365f1b6c6222f572cd2c4c9574617ea5 (diff)
downloademacs-6509f7727e1077ab60e24c3f077ff06c3cadb2d5.tar.gz
emacs-6509f7727e1077ab60e24c3f077ff06c3cadb2d5.zip
Fix message-box and avoid compilation warnings.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c
index 670369cd322..5103f87a27c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5540,10 +5540,12 @@ the return value is nil. Otherwise the value is t. */)
5540 if (data->frame_menu_bar_lines 5540 if (data->frame_menu_bar_lines
5541 != previous_frame_menu_bar_lines) 5541 != previous_frame_menu_bar_lines)
5542 { 5542 {
5543#ifdef HAVE_WINDOW_SYSTEM
5543 if (FRAME_WINDOW_P (f)) 5544 if (FRAME_WINDOW_P (f))
5544 x_set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), 5545 x_set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines),
5545 make_number (0)); 5546 make_number (0));
5546 else /* TTY or MSDOS */ 5547 else /* TTY or MSDOS */
5548#endif
5547 set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), 5549 set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines),
5548 make_number (0)); 5550 make_number (0));
5549 } 5551 }
@@ -5743,11 +5745,13 @@ the return value is nil. Otherwise the value is t. */)
5743#ifdef HAVE_MENUS 5745#ifdef HAVE_MENUS
5744 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 5746 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
5745 { 5747 {
5748#ifdef HAVE_WINDOW_SYSTEM
5746 if (FRAME_WINDOW_P (f)) 5749 if (FRAME_WINDOW_P (f))
5747 x_set_menu_bar_lines (f, 5750 x_set_menu_bar_lines (f,
5748 make_number (previous_frame_menu_bar_lines), 5751 make_number (previous_frame_menu_bar_lines),
5749 make_number (0)); 5752 make_number (0));
5750 else /* TTY or MSDOS */ 5753 else /* TTY or MSDOS */
5754#endif
5751 set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), 5755 set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines),
5752 make_number (0)); 5756 make_number (0));
5753 } 5757 }