Mercurial > emacs
view etc/images/sort-criteria.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 | ed7704221f2b |
| children |
line wrap: on
line source
/* XPM */ static char * stock_sort_criteria_xpm[] = { "24 24 28 1", " c None", ". c #000000", "+ c #FFFFFF", "@ c #D3D3D3", "# c #F2ECE1", "$ c #F4EFE5", "% c #DFDAD2", "& c #C9C4BD", "* c #74716E", "= c #FAFAFA", "- c #EADFC9", "; c #ECE2CF", "> c #EEE5D4", ", c #4C4B48", "' c #F5F5F5", ") c #C9C9C9", "! c #E2D2B1", "~ c #CFC4B1", "{ c #BFBFBF", "] c #C0C0C0", "^ c #C7B99C", "/ c #F0F0F0", "( c #B7B7B7", "_ c #9A8F78", ": c #877E69", "< c #AFA389", "[ c #A09889", "} c #314E6C", " ", " ", " ...... ", " ... ", " ... ", " ... ", " ......... ... ", " .+@.#$%&*. ...... ", " .=@.-;;;>, ", " .').!!!!.~. ", " .{].^^!.^.~. ", " ./(.._.^.:.~. ", " .....<.:...[. ", " .:.. .. ", " .. ", " ", " }}}} ", " }} }} ", " }} }} ", " }}}}}} ", " }} }} ", " }} }} ", " ", " "};