* doc/lispref/keymaps.texi (Tool Bar): Mention separators.

* etc/NEWS: Related markup.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e184f2637375dcbdc3a85c4175e69f8d87aa7450..e26f91b1b4c675cbde1ac7dfb594773bedb2fc6b 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-06  Glenn Morris  <rgm@gnu.org>
 
+       * keymaps.texi (Tool Bar): Mention separators.
+
        * modes.texi (Running Hooks): Mention run-hook-wrapped.
 
        * control.texi (Handling Errors):

diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 8e03ade285f57dc096f54b1902cda608f490d410..923989413ee30f5de38c7b654da40d2044df7575 100644 (file)
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2658,6 +2658,15 @@ The @code{:rtl} property specifies an alternative image to use for
 right-to-left languages.  Only the Gtk+ version of Emacs supports this
 at present.
 
+Like the menu bar, the tool bar can display separators (@pxref{Menu
+Separators}).  Tool bar separators are vertical rather than
+horizontal, though, and only a single style is supported.  Separators
+are represented in the tool bar keymap in the same way as for the
+menu-bar, i.e. using a @code{(menu-item "--"}) entry.  The Gtk+ and
+Nextstep tool bars render separators natively, otherwise Emacs selects
+a separator image that is appropriate for the display.  Note that tool
+bar separators do not support any properties, such as @code{:visible}.
+
 The default tool bar is defined so that items specific to editing do not
 appear for major modes whose command symbol has a @code{mode-class}
 property of @code{special} (@pxref{Major Mode Conventions}).  Major

diff --git a/etc/NEWS b/etc/NEWS
index 86b4f60dddf675bfb87122b115eb24c9a365b60a..9ea5d6af7b033d11dd182b039b6b1fc382a2bf6d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1335,6 +1335,7 @@ argument is supplied (see Trash changes, above).
 or RGB triplet, instead of signaling an error if the user provides
 invalid input.
 
++++
 ** Tool-bars can display separators.
 Tool-bar separators are handled like menu separators in menu-bar maps,
 i.e. via menu entries of the form `(menu-item "--")'.