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).

2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9777ab2202b..41e8c09cacf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Vdefault_frame_alist): Give default value entries for
+        menu-bar-lines and tool-bar-lines consistent with the startup
+        default (Bug#2249).
+
 2010-06-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * gtkutil.c (xg_update_scrollbar_pos):
diff --git a/src/frame.c b/src/frame.c
index 3e1b2daf556..4fd0573e2c0 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4595,7 +4595,8 @@ For values specific to the separate minibuffer frame, see
 The `menu-bar-lines' element of the list controls whether new frames
  have menu bars; `menu-bar-mode' works by altering this element.
 Setting this variable does not affect existing frames, only new ones.  */);
-  Vdefault_frame_alist = Qnil;
+  Vdefault_frame_alist = list2 (Fcons (Qmenu_bar_lines, make_number (1)),
+                                Fcons (Qtool_bar_lines, make_number (1)));
 
   DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
                doc: /* Default position of scroll bars on this window-system.  */);