diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-03-22 08:26:56 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-03-22 08:26:56 +0100 |
| commit | 93318cbd4081abd95958485429b6fc497089b26e (patch) | |
| tree | c68359bb38469a82c4a63d25e342a21cc41ae968 /src/frame.c | |
| parent | 4102856c09db692ac87c8214618134826c02fd51 (diff) | |
| download | emacs-93318cbd4081abd95958485429b6fc497089b26e.tar.gz | |
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).
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index f05f9f751da..5915c00bca1 100644 --- a/src/frame.c +++ b/src/frame.c @@ -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))); |