• Chong Yidong's avatar
    Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249). · 6431f2e6
    Chong Yidong authored
    Don't add entries for `menu-bar-lines' and `tool-bar-lines' to
    `default-frame-alist' and `initial-frame-alist' at startup.
    Instead, use X resources to update the `menu-bar-mode' and
    `tool-bar-mode' variables at startup, and use them as defaults during
    frame creation.
    * lisp/frame.el (frame-notice-user-settings): Don't change
    default-frame-alist based on menu-bar-mode and tool-bar-mode, or
    vice versa.
    * lisp/menu-bar.el (menu-bar-mode):
    * lisp/tool-bar.el (tool-bar-mode): Don't change default-frame-alist.
    Set init-value to t.
    * lisp/startup.el (command-line): Use X resources to set the value of
    menu-bar-mode and tool-bar-mode, before calling frame-initialize.
    * src/frame.c (Vmenu_bar_mode, Vtool_bar_mode): New vars.
    * src/w32fns.c (Fx_create_frame):
    * src/nsfns.m (Fx_create_frame): Likewise.
    * src/xfns.c (Fx_create_frame): Don't consult X resouces when setting
    menu-bar-lines and tool-bar-lines.  Use menu-bar-mode and
    tool-bar-mode, which are now set using these X resources at
    startup, to determine the defaults.
w32fns.c 224 KB