[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99663: bug #5736: Allow X-resource menuBar to take on/off as documented.

[Jan D.]

------------------------------------------------------------
revno: 99663
committer: Jan D. <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-03-22 08:26:56 +0100
message:
  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).
modified:
  doc/emacs/ChangeLog
  doc/emacs/frames.texi
  doc/emacs/xresources.texi
  src/ChangeLog
  src/dispextern.h
  src/frame.c
  src/xfns.c

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-03-21 22:13:26 +0000
+++ b/doc/emacs/ChangeLog       2010-03-22 07:26:56 +0000
@@ -1,3 +1,10 @@
+2010-03-20  Jan Djärv  <address@hidden>
+
+       * xresources.texi (Table of Resources): Clarify toolBar number
+       for Gtk+.
+
+       * frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
+
 2010-03-21  Chong Yidong  <address@hidden>
 
        * 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  <address@hidden>
 
        * custom.texi (Init Examples): Add xref to Locals.

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2010-03-20 17:24:06 +0000
+++ b/doc/emacs/frames.texi     2010-03-22 07:26:56 +0000
@@ -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)}

=== modified file 'doc/emacs/xresources.texi'
--- a/doc/emacs/xresources.texi 2010-03-20 17:24:06 +0000
+++ b/doc/emacs/xresources.texi 2010-03-22 07:26:56 +0000
@@ -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
address@hidden is address@hidden, 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 address@hidden, 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
address@hidden has no effect.
 
 @item @code{useXIM} (class @code{UseXIM})
 @cindex XIM

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-20 03:37:39 +0000
+++ b/src/ChangeLog     2010-03-22 07:26:56 +0000
@@ -1,3 +1,11 @@
+2010-03-20  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2010-02-19 13:57:53 +0000
+++ b/src/dispextern.h  2010-03-22 07:26:56 +0000
@@ -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,

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-01-29 19:02:02 +0000
+++ b/src/frame.c       2010-03-22 07:26:56 +0000
@@ -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)));
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-03-20 03:37:39 +0000
+++ b/src/xfns.c        2010-03-22 07:26:56 +0000
@@ -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,