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

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 283598c21377ceec65e800a9ed35341b5d079fe6..5b568b627c41d239fb3872dd9c8ca1e613b024f3 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-10  Chong Yidong  <cyd@stupidchicken.com>
 
+       * 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)

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 42deed05d682fe38ad8dcfa5fa11f4bad1f9259c..597df621106ff6a0d2f779d7452f9482fbcdef07 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -668,8 +668,8 @@ menu bar line; they treat larger values as 1.)
 
 @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

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 6d4c95fca3dbb3dc808616da8c4edb8f5ebac389..de792c76e9fca7fac25f78750d8c6aed74c59b3b 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2703,7 +2703,7 @@ specifies the local map to make the definition in.  The argument
 @code{tool-bar-add-item-from-menu}.
 @end defun
 
-@defvar auto-resize-tool-bar
+@defvar auto-resize-tool-bars
 If this variable is non-@code{nil}, 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 @@ frame's height.
 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