From fac580ebfad46d89bfa3e01f53136f8404762ffa Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Jun 2010 15:32:37 -0400 Subject: [PATCH] Revert last change. --- lisp/ChangeLog | 6 ------ lisp/frame.el | 3 +-- src/ChangeLog | 6 ------ src/frame.c | 3 +-- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a92cede973..b9f4f36cc28 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * 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 * flyspell.el (flyspell-check-previous-highlighted-word): Make diff --git a/lisp/frame.el b/lisp/frame.el index eb125cdda4a..7456db4021c 100644 --- 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 41e8c09cacf..9777ab2202b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * 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 * gtkutil.c (xg_update_scrollbar_pos): diff --git a/src/frame.c b/src/frame.c index 4fd0573e2c0..3e1b2daf556 100644 --- 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. */); -- 2.39.2