Mercurial > emacs
changeset 107526:af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
* frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
* xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.
* dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.
* xresources.texi (Table of Resources): Clarify toolBar number
for Gtk+.
* frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 22 Mar 2010 08:26:56 +0100 |
| parents | cd363410df90 |
| children | 6b6e7435e4fd |
| files | doc/emacs/ChangeLog doc/emacs/frames.texi doc/emacs/xresources.texi src/ChangeLog src/dispextern.h src/frame.c src/xfns.c |
| diffstat | 7 files changed, 32 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sun Mar 21 18:13:26 2010 -0400 +++ b/doc/emacs/ChangeLog Mon Mar 22 08:26:56 2010 +0100 @@ -1,3 +1,10 @@ +2010-03-20 Jan Djärv <jan.h.d@swipnet.se> + + * xresources.texi (Table of Resources): Clarify toolBar number + for Gtk+. + + * frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736). + 2010-03-21 Chong Yidong <cyd@stupidchicken.com> * dired.texi (Dired Updating): Document dired-auto-revert-buffer. @@ -18,6 +25,7 @@ * xresources.texi (Table of Resources): * mule.texi (Defining Fontsets, Charsets): Update xrefs. +>>>>>>> MERGE-SOURCE 2010-03-06 Chong Yidong <cyd@stupidchicken.com> * custom.texi (Init Examples): Add xref to Locals.
--- a/doc/emacs/frames.texi Sun Mar 21 18:13:26 2010 -0400 +++ b/doc/emacs/frames.texi Mon Mar 22 08:26:56 2010 +0100 @@ -1224,7 +1224,7 @@ With no argument, this command toggles Menu Bar mode, a minor mode. With an argument, the command turns Menu Bar mode on if the argument is positive, off if the argument is not positive. You can use -the X resource @samp{menuBarLines} to control the initial setting of +the X resource @samp{menuBar} to control the initial setting of Menu Bar mode. @xref{Resources}. @kindex C-Mouse-3 @r{(when menu bar is disabled)}
--- a/doc/emacs/xresources.texi Sun Mar 21 18:13:26 2010 -0400 +++ b/doc/emacs/xresources.texi Mon Mar 22 08:26:56 2010 +0100 @@ -307,12 +307,14 @@ @item @code{toolBar} (class @code{ToolBar}) @cindex tool bar Number of lines to reserve for the tool bar. A zero value suppresses -the tool bar. If the value is non-zero and -@code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's size -will be changed automatically so that all tool bar items are visible. +the tool bar. For the Emacs tool bar (i.e. not Gtk+), if the value is +non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's +size will be changed automatically so that all tool bar items are visible. If the value of @code{auto-resize-tool-bars} is @code{grow-only}, the tool bar expands automatically, but does not contract automatically. To contract the tool bar, you must redraw the frame by entering @kbd{C-l}. +For the Gtk+ tool bar, any non-zero value means on and +@code{auto-resize-tool-bars} has no effect. @item @code{useXIM} (class @code{UseXIM}) @cindex XIM
--- a/src/ChangeLog Sun Mar 21 18:13:26 2010 -0400 +++ b/src/ChangeLog Mon Mar 22 08:26:56 2010 +0100 @@ -1,3 +1,11 @@ +2010-03-20 Jan Djärv <jan.h.d@swipnet.se> + + * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736). + + * xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER. + + * dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new. + 2010-03-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
--- a/src/dispextern.h Sun Mar 21 18:13:26 2010 -0400 +++ b/src/dispextern.h Mon Mar 22 08:26:56 2010 +0100 @@ -3122,7 +3122,8 @@ RES_TYPE_FLOAT, RES_TYPE_BOOLEAN, RES_TYPE_STRING, - RES_TYPE_SYMBOL + RES_TYPE_SYMBOL, + RES_TYPE_BOOLEAN_NUMBER }; extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object,
--- a/src/frame.c Sun Mar 21 18:13:26 2010 -0400 +++ b/src/frame.c Mon Mar 22 08:26:56 2010 +0100 @@ -4005,6 +4005,13 @@ case RES_TYPE_NUMBER: return make_number (atoi (SDATA (tem))); + case RES_TYPE_BOOLEAN_NUMBER: + if (!strcmp (SDATA (tem), "on") + || !strcmp (SDATA (tem), "true")) + return make_number (1); + return make_number (atoi (SDATA (tem))); + break; + case RES_TYPE_FLOAT: return make_float (atof (SDATA (tem)));
--- a/src/xfns.c Sun Mar 21 18:13:26 2010 -0400 +++ b/src/xfns.c Mon Mar 22 08:26:56 2010 +0100 @@ -3418,7 +3418,7 @@ init_frame_faces (f); x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), - "menuBar", "MenuBar", RES_TYPE_NUMBER); + "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER); x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), "toolBar", "ToolBar", RES_TYPE_NUMBER); x_default_parameter (f, parms, Qbuffer_predicate, Qnil,