andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug #5736: Allow X-resource menuBar to take on/off as documented.

Browse source 
* 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).
This commit is contained in:
Jan Djärv 2010-03-22 08:26:56 +01:00
parent 4102856c09
commit 93318cbd40
7 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/ChangeLog
View file

@ -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.

2
doc/emacs/frames.texi
View file

@ -1224,7 +1224,7 @@ menu-bar-mode} or by customizing the variable @code{menu-bar-mode}.
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)}

8
doc/emacs/xresources.texi
View file

@ -307,12 +307,14 @@ Name to display in the title bar of the initial Emacs frame.
@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

8
src/ChangeLog
View file

@ -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

3
src/dispextern.h
View file

@ -3122,7 +3122,8 @@ enum resource_types
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,

7
src/frame.c
View file

@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
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)));

2
src/xfns.c
View file

@ -3418,7 +3418,7 @@ This function is an internal primitive--use `make-frame' instead. */)
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,