diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/frame.el | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/frame.c | 3 |
4 files changed, 16 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9f4f36cc28..7a92cede973 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/frame.el b/lisp/frame.el index 7456db4021c..eb125cdda4a 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -52,7 +52,8 @@ 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 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 --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. */); |