[Emacs-diffs] emacs/doc/lispref ChangeLog frames.texi keymaps...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/10 02:12:02

Modified files:
        doc/lispref    : ChangeLog frames.texi keymaps.texi 

Log message:
        * keymaps.texi (Tool Bar): Mention that some platforms do not
        support multi-line toolbars.  Suggested by Stephen Eglen.
        
        * frames.texi (Layout Parameters): Mention that Nextstep also
        allows only one tool-bar line.  Suggested by Stephen Eglen.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/ChangeLog?cvsroot=emacs&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/frames.texi?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/keymaps.texi?cvsroot=emacs&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- ChangeLog   10 Apr 2009 01:16:27 -0000      1.254
+++ ChangeLog   10 Apr 2009 02:12:01 -0000      1.255
@@ -1,5 +1,11 @@
 2009-04-10  Chong Yidong  <address@hidden>
 
+       * keymaps.texi (Tool Bar): Mention that some platforms do not
+       support multi-line toolbars.  Suggested by Stephen Eglen.
+
+       * frames.texi (Layout Parameters): Mention that Nextstep also
+       allows only one tool-bar line.  Suggested by Stephen Eglen.
+
        * nonascii.texi (Text Representations): Copyedits.
        (Coding System Basics): Also mention utf-8-emacs.
        (Converting Representations, Selecting a Representation)

Index: frames.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/frames.texi,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- frames.texi 4 Apr 2009 22:34:24 -0000       1.25
+++ frames.texi 10 Apr 2009 02:12:01 -0000      1.26
@@ -668,8 +668,8 @@
 
 @item tool-bar-lines
 The number of lines to use for the tool bar.  A value of @code{nil}
-means don't display a tool bar.  (GTK allows at most one tool bar line;
-it treats larger values as 1.)
+means don't display a tool bar.  (GTK and Nextstep allow at most one
+tool bar line; they treat larger values as 1.)
 
 @item line-spacing
 Additional space to leave below each text line, in pixels (a positive

Index: keymaps.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/keymaps.texi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- keymaps.texi        4 Apr 2009 22:34:24 -0000       1.14
+++ keymaps.texi        10 Apr 2009 02:12:02 -0000      1.15
@@ -2703,7 +2703,7 @@
 @code{tool-bar-add-item-from-menu}.
 @end defun
 
address@hidden auto-resize-tool-bar
address@hidden auto-resize-tool-bars
 If this variable is address@hidden, the tool bar automatically resizes to
 show all defined tool bar items---but not larger than a quarter of the
 frame's height.
@@ -2711,6 +2711,9 @@
 If the value is @code{grow-only}, the tool bar expands automatically,
 but does not contract automatically.  To contract the tool bar, the
 user has to redraw the frame by entering @kbd{C-l}.
+
+If Emacs is built with GTK or Nextstep, the tool bar can only show one
+line, so this variable has no effect.
 @end defvar
 
 @defvar auto-raise-tool-bar-buttons