[Emacs-diffs] /srv/bzr/emacs/trunk r100644: Revert last change.

[Chong Yidong]

------------------------------------------------------------
revno: 100644
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-25 15:32:37 -0400
message:
  Revert last change.
modified:
  lisp/ChangeLog
  lisp/frame.el
  src/ChangeLog
  src/frame.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-25 19:24:05 +0000
+++ b/lisp/ChangeLog    2010-06-25 19:32:37 +0000
@@ -1,9 +1,3 @@
-2010-06-25  Chong Yidong  <address@hidden>
-
-       * 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  <address@hidden>
 
        * flyspell.el (flyspell-check-previous-highlighted-word): Make

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2010-06-25 19:24:05 +0000
+++ b/lisp/frame.el     2010-06-25 19:32:37 +0000
@@ -52,8 +52,7 @@
 ;; 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,
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-25 19:24:05 +0000
+++ b/src/ChangeLog     2010-06-25 19:32:37 +0000
@@ -1,9 +1,3 @@
-2010-06-25  Chong Yidong  <address@hidden>
-
-       * 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  <address@hidden>
 
        * gtkutil.c (xg_update_scrollbar_pos):

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-06-25 19:24:05 +0000
+++ b/src/frame.c       2010-06-25 19:32:37 +0000
@@ -4595,8 +4595,7 @@
 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.  
*/);