Mercurial > emacs
view etc/images/info.xpm @ 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 | fbbac2460322 |
children |
line wrap: on
line source
/* XPM */ static char * info_xpm[] = { "24 24 29 1", " c None", ". c #4F4F4F", "+ c #616161", "@ c #979797", "# c #A6A6A6", "$ c #BEBEBE", "% c #E0E0E0", "& c #C1C1C1", "* c #7B7B7B", "= c #D2D2D2", "- c #C8C8C8", "; c #DFDFDF", "> c #F8F8F8", ", c #8E8E8E", "' c #D7D7D7", ") c #D4D4D4", "! c #6E6E6E", "~ c #E5E5E5", "{ c #CDCDCD", "] c #727272", "^ c #DBDBDB", "/ c #6B6B6B", "( c #9C9C9C", "_ c #A5A5A5", ": c #737373", "< c #AEAEAE", "[ c #A3A3A3", "} c #B5B5B5", "| c #2B2B2B", " ", " .+++. ", " +@#$%%&*. ", " +$======%$. ", " +@-=;>>>;==,. ", " +'=>>>>>>>$)+ ", " !)=%~>>>~;={+ ", " ]$==$,,,$^=$+ ", " /(==,%%$,==_ ", " :$=%%%,$='+ ", " +(=%;%<^;, ", " +;=%<=;$+ ", " +$;==;;[ ", " @@@@@}@ ", " @>>>)))}@ ", " @>>)}@@ ", " @>~))))}@ ", " @@>>)}}@@ ", " @>~))))}@ ", " @@@@@@@ ", " .+.|| ", " ", " ", " "};