# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1277493845 14400
# Node ID c4638d45dada8f7af1dd8c1200a6a5ce2a5d5de1
# Parent  e1b36fd5197d575fb2ad9d37dfac2225313a8cc8
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).

diff -r e1b36fd5197d -r c4638d45dada lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 25 10:31:50 2010 +0200
+++ b/lisp/ChangeLog	Fri Jun 25 15:24:05 2010 -0400
@@ -1,3 +1,9 @@
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* 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  <agustin.martin@hispalinux.es>
 
 	* flyspell.el (flyspell-check-previous-highlighted-word): Make
diff -r e1b36fd5197d -r c4638d45dada lisp/frame.el
--- a/lisp/frame.el	Fri Jun 25 10:31:50 2010 +0200
+++ b/lisp/frame.el	Fri Jun 25 15:24:05 2010 -0400
@@ -52,7 +52,8 @@
 ;; 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,
 
diff -r e1b36fd5197d -r c4638d45dada src/ChangeLog
--- a/src/ChangeLog	Fri Jun 25 10:31:50 2010 +0200
+++ b/src/ChangeLog	Fri Jun 25 15:24:05 2010 -0400
@@ -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 -r e1b36fd5197d -r c4638d45dada src/frame.c
--- a/src/frame.c	Fri Jun 25 10:31:50 2010 +0200
+++ b/src/frame.c	Fri Jun 25 15:24:05 2010 -0400
@@ -4595,7 +4595,8 @@
 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.  */);