aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <[email protected]>2010-06-25 15:24:05 -0400
committerChong Yidong <[email protected]>2010-06-25 15:24:05 -0400
commita9fdbaae1a386c8884c70bab38abb4c6c81c6a8b (patch)
tree3b5baab36d48d1763e11c9f086430dba389386da /lisp
parentf5cbf40e5fa3b56560e382f1a929f1beeb8e2618 (diff)
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')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/frame.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9f4f36cc2..7a92cede97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-25 Chong Yidong <[email protected]>
+
+ * frame.el (initial-frame-alist): Give default value entries for
+ menu-bar-lines and tool-bar-lines consistent with the startup
+ default (Bug#2249).
+
2010-06-25 Agustín Martín <[email protected]>
* flyspell.el (flyspell-check-previous-highlighted-word): Make
diff --git a/lisp/frame.el b/lisp/frame.el
index 7456db4021..eb125cdda4 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,