diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:56:47 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:56:47 -0400 |
| commit | 481044622937b001ee07a6f8c3f81c1e73ef9eaf (patch) | |
| tree | 70420f40e8e8db27725ea87ed65c787ba78d75de /src/msdos.c | |
| parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
| download | emacs-481044622937b001ee07a6f8c3f81c1e73ef9eaf.tar.gz | |
Adapt terminal frames to latest menu-bar changes.
* frame.c (make_frame): Initialize menu_bar_lines and
tool_bar_lines members.
(make_initial_frame, make_terminal_frame): Initialize
menu_bar_lines using value of menu-bar-mode.
* msdos.c (IT_set_frame_parameters): Don't set menu-bar-lines.
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/msdos.c b/src/msdos.c index 668243ef422..c1c838375e6 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -2074,10 +2074,6 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist) unsigned long orig_fg, orig_bg; Lisp_Object frame_bg, frame_fg; 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. */ @@ -2116,8 +2112,6 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object 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; } if (tty->termscript && reverse) @@ -2217,18 +2211,6 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object 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 (reverse) |