summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-06-25 15:24:05 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-06-25 15:24:05 -0400
commita9fdbaae1a386c8884c70bab38abb4c6c81c6a8b (patch)
tree3b5baab36d48d1763e11c9f086430dba389386da /lisp/frame.el
parentf5cbf40e5fa3b56560e382f1a929f1beeb8e2618 (diff)
downloademacs-a9fdbaae1a386c8884c70bab38abb4c6c81c6a8b.tar.gz
emacs-a9fdbaae1a386c8884c70bab38abb4c6c81c6a8b.tar.bz2
emacs-a9fdbaae1a386c8884c70bab38abb4c6c81c6a8b.zip
Change initial-frame-alist and default-frame-alist defaults (Bug#2249).
Since the menu-bar and tool-bar are now unconditionally turned on by default, we can let the defcustom defaults reflect that. * frame.el (initial-frame-alist): Give default value entries for menu-bar-lines and tool-bar-lines consistent with the startup default (Bug#2249). * frame.c (Vdefault_frame_alist): Give default value entries for menu-bar-lines and tool-bar-lines consistent with the startup default (Bug#2249).
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 7456db4021c..eb125cdda4a 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -52,7 +52,8 @@ Parameters specified here supersede the values given in
;; The initial value given here used to ask for a minibuffer.
;; But that's not necessary, because the default is to have one.
;; By not specifying it here, we let an X resource specify it.
-(defcustom initial-frame-alist nil
+(defcustom initial-frame-alist
+ '((menu-bar-lines . 1) (tool-bar-lines . 1))
"Alist of parameters for the initial X window frame.
You can set this in your init file; for example,