summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-06-25 15:24:05 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-06-25 15:24:05 -0400
commita9fdbaae1a386c8884c70bab38abb4c6c81c6a8b (patch)
tree3b5baab36d48d1763e11c9f086430dba389386da /src/frame.c
parentf5cbf40e5fa3b56560e382f1a929f1beeb8e2618 (diff)
downloademacs-a9fdbaae1a386c8884c70bab38abb4c6c81c6a8b.tar.gz
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).
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c3
1 files changed, 2 insertions, 1 deletions
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. */);