Mercurial > emacs
annotate .gitignore @ 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 | 9a2d92bd2a3e |
children | 6719c75fa3ac |
rev | line source |
---|---|
102379 | 1 autom4te.cache |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
2 makefile |
104669
9a2d92bd2a3e
Ignore all backup files.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102380
diff
changeset
|
3 *~ |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
4 |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
5 /bin/ |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
6 /site-lisp/ |
102379 | 7 |
8 # arch-tag: 75cd3c50-1875-4814-8360-190f7de38302 |