From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Newsgroups: gmane.emacs.bugs Subject: bug#5736: 23.1; Xresource menuBar does not work as advertized Date: Sun, 21 Mar 2010 08:35:38 +0100 Message-ID: <4BA5CC4A.7080307@swipnet.se> References: <4BA4C2A2.1090300@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1269158130 23289 80.91.229.12 (21 Mar 2010 07:55:30 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 21 Mar 2010 07:55:30 +0000 (UTC) Cc: 5736@debbugs.gnu.org, Tim Landscheidt To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 21 08:55:25 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NtG0K-0007Nf-Ei for geb-bug-gnu-emacs@m.gmane.org; Sun, 21 Mar 2010 08:55:24 +0100 Original-Received: from localhost ([127.0.0.1]:59394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NtG0J-00023m-Cr for geb-bug-gnu-emacs@m.gmane.org; Sun, 21 Mar 2010 03:55:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NtG0D-000230-EP for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2010 03:55:17 -0400 Original-Received: from [140.186.70.92] (port=35094 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NtG06-000216-RX for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2010 03:55:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NtG01-0007rs-PM for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2010 03:55:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55914) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NtG01-0007rm-Mg for bug-gnu-emacs@gnu.org; Sun, 21 Mar 2010 03:55:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NtFhZ-0007Dm-MY; Sun, 21 Mar 2010 03:36:01 -0400 X-Loop: bug-gnu-emacs@gnu.org Resent-From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 21 Mar 2010 07:36:01 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-GNU-PR-Message: followup 5736 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 5736-submit@debbugs.gnu.org id=B5736.126915694627749 (code B ref 5736); Sun, 21 Mar 2010 07:36:01 +0000 Original-Received: (at 5736) by debbugs.gnu.org; 21 Mar 2010 07:35:46 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NtFhK-0007DW-Is for submit@debbugs.gnu.org; Sun, 21 Mar 2010 03:35:46 -0400 Original-Received: from smtprelay-h22.telenor.se ([195.54.99.197]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NtFhH-0007DR-UP for 5736@debbugs.gnu.org; Sun, 21 Mar 2010 03:35:45 -0400 Original-Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-h22.telenor.se (Postfix) with ESMTP id E9C9344F4E for <5736@debbugs.gnu.org>; Sun, 21 Mar 2010 08:35:39 +0100 (CET) X-SENDER-IP: [85.225.45.110] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlA6AMZopUtV4S1uPGdsb2JhbACbOgwBAQEBNy24BIR9BA X-IronPort-AV: E=Sophos;i="4.51,282,1267398000"; d="scan'208";a="53678937" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 21 Mar 2010 08:35:39 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id AC6D57FA01A; Sun, 21 Mar 2010 08:35:38 +0100 (CET) User-Agent: Thunderbird 2.0.0.24 (X11/20100317) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 21 Mar 2010 03:36:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:35671 Archived-At: Stefan Monnier skrev: >> It is easy to fix, but as 23.2 is approaching, I guess the Emacs maint= ainers >> must give their Ok. >=20 > I'd need to see the patch first, >=20 =3D=3D=3D modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-03-06 19:02:49 +0000 +++ doc/emacs/ChangeLog 2010-03-20 12:35:25 +0000 @@ -1,3 +1,10 @@ +2010-03-20 Jan Dj=E4rv + + * xresources.texi (Table of Resources): Clarify toolBar number + for Gtk+. + + * frames.texi (Menu Bars): menuBarLines =3D> menuBar (bug#5736). + 2010-03-06 Chong Yidong * custom.texi (Init Examples): Add xref to Locals. =3D=3D=3D modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2010-03-02 22:56:36 +0000 +++ doc/emacs/frames.texi 2010-03-20 12:23:03 +0000 @@ -957,7 +957,7 @@ With no argument, this command toggles Menu Bar mode, a minor mode. With an argument, the command turns Menu Bar mode on if th= e 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)} =3D=3D=3D modified file 'doc/emacs/xresources.texi' --- doc/emacs/xresources.texi 2010-01-13 08:35:10 +0000 +++ doc/emacs/xresources.texi 2010-03-20 12:34:59 +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 -@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 ba= r's +size will be changed automatically so that all tool bar items are visibl= e. 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 =3D=3D=3D modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 03:37:39 +0000 +++ src/ChangeLog 2010-03-20 12:39:51 +0000 @@ -1,3 +1,11 @@ +2010-03-20 Jan Dj=E4rv + + * 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 * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around =3D=3D=3D modified file 'src/dispextern.h' --- src/dispextern.h 2010-02-19 13:57:53 +0000 +++ src/dispextern.h 2010-03-20 12:35:41 +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, =3D=3D=3D modified file 'src/frame.c' --- src/frame.c 2010-01-29 19:02:02 +0000 +++ src/frame.c 2010-03-20 12:29:04 +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))); =3D=3D=3D modified file 'src/xfns.c' --- src/xfns.c 2010-03-20 03:37:39 +0000 +++ src/xfns.c 2010-03-20 12:29:12 +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, Jan D.