Mercurial > emacs
changeset 109050:16aebfb142a6
Revert last change.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 25 Jun 2010 15:32:37 -0400 |
| parents | c4638d45dada |
| children | 446dbaf86e72 b6c00fb16e8f |
| files | lisp/ChangeLog lisp/frame.el src/ChangeLog src/frame.c |
| diffstat | 4 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jun 25 15:24:05 2010 -0400 +++ b/lisp/ChangeLog Fri Jun 25 15:32:37 2010 -0400 @@ -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
--- a/lisp/frame.el Fri Jun 25 15:24:05 2010 -0400 +++ b/lisp/frame.el Fri Jun 25 15:32:37 2010 -0400 @@ -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,
--- a/src/ChangeLog Fri Jun 25 15:24:05 2010 -0400 +++ b/src/ChangeLog Fri Jun 25 15:32:37 2010 -0400 @@ -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):
--- a/src/frame.c Fri Jun 25 15:24:05 2010 -0400 +++ b/src/frame.c Fri Jun 25 15:32:37 2010 -0400 @@ -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. */);