Mercurial > emacs
diff lisp/ChangeLog @ 109058:2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 26 Jun 2010 20:30:52 -0400 |
| parents | 7aadb3822de4 |
| children | 5c9de51f68b5 |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 26 17:41:12 2010 +0300 +++ b/lisp/ChangeLog Sat Jun 26 20:30:52 2010 -0400 @@ -1,3 +1,16 @@ +2010-06-27 Chong Yidong <cyd@stupidchicken.com> + + * startup.el (command-line): Use X resources to set the value of + menu-bar-mode and tool-bar-mode, before calling frame-initialize. + + * menu-bar.el (menu-bar-mode): + * tool-bar.el (tool-bar-mode): Don't change default-frame-alist. + Set init-value to t. + + * frame.el (frame-notice-user-settings): Don't change + default-frame-alist based on menu-bar-mode and tool-bar-mode, or + vice versa (Bug#2249). + 2010-06-26 Eli Zaretskii <eliz@gnu.org> * w32-fns.el (w32-convert-standard-filename): Doc fix.