Revert last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a92cede9732e62ee5f3bb593bb617536c835fae..b9f4f36cc28ba68e83a7561e31fe73cf595add6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
-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 --git a/lisp/frame.el b/lisp/frame.el
index eb125cdda4ab846d72d1b9e8cb6de608a8dd4ba9..7456db4021cf20705fd958b9f695d8c3a93c7a70 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -52,8 +52,7 @@ 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
-  '((menu-bar-lines . 1) (tool-bar-lines . 1))
+(defcustom initial-frame-alist nil
   "Alist of parameters for the initial X window frame.
 You can set this in your init file; for example,
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 41e8c09cacf3632452a4298888b853aaad330a53..9777ab2202b8e8188d246705294698c8dfda539c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-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 4fd0573e2c02507056be9de6a2dfc4cf510f4392..3e1b2daf55662b74a4398f61521ad2e07dcfcaf0 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -4595,8 +4595,7 @@ 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 = list2 (Fcons (Qmenu_bar_lines, make_number (1)),
-                               Fcons (Qtool_bar_lines, make_number (1)));
+  Vdefault_frame_alist = Qnil;
 
   DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
               doc: /* Default position of scroll bars on this window-system.  */);