mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 12:20:39 -08:00
Code Issues Projects Releases Wiki Activity

Fix menu bar display on MS-DOS.

Browse source 
msdos.c (IT_set_frame_parameters): Set menu-bar-lines according
 to menu-bar-mode, if not set in the frame parameters or in
 default-frame-alist.
This commit is contained in:
Eli Zaretskii 2010-07-03 14:54:21 +03:00
parent ae492bec16
commit 1e6255ae88
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2010-07-03 Eli Zaretskii <eliz@gnu.org>
* msdos.c (IT_set_frame_parameters): Set menu-bar-lines according
to menu-bar-mode, if not set in the frame parameters or in
default-frame-alist.
* w32console.c (sys_tputs): Adjust argument list to prototype in
term.c.

18
src/msdos.c
View file

@ -2098,6 +2098,10 @@ IT_set_frame_parameters (f, alist)
Lisp_Object frame_bg, frame_fg;
extern Lisp_Object Qdefault, QCforeground, QCbackground;
struct tty_display_info *tty = FRAME_TTY (f);
extern Lisp_Object Qmenu_bar_lines;
extern Lisp_Object Vmenu_bar_mode;
int menu_bar_lines_defined =
!NILP (Fassq (Qmenu_bar_lines, Vdefault_frame_alist));
/* If we are creating a new frame, begin with the original screen colors
used for the initial frame. */
@ -2144,6 +2148,8 @@ IT_set_frame_parameters (f, alist)
if (EQ (prop, Qreverse))
reverse = EQ (val, Qt);
else if (!menu_bar_lines_defined && EQ (prop, Qmenu_bar_lines))
menu_bar_lines_defined = 1;
}
need_to_reverse = reverse && !was_reverse;
@ -2226,6 +2232,18 @@ IT_set_frame_parameters (f, alist)
store_frame_param (f, prop, val);
}
/* If menu-bar-lines is neither in the frame parameters nor in
default-frame-alist, set it according to menu-bar-mode. */
if (!menu_bar_lines_defined)
{
store_frame_param (f, Qmenu_bar_lines,
NILP (Vmenu_bar_mode)
? make_number (0) : make_number (1));
if (tty->termscript)
fprintf (tty->termscript, "<MENU BAR LINES DEFAULTED: %d\n",
!NILP (Vmenu_bar_mode));
}
/* If they specified "reverse", but not the colors, we need to swap
the current frame colors. */
if (need_to_reverse)