Implement tool-bar separators for non-GTK tool-bars.

* lisp/tool-bar.el (tool-bar--image-expression): New function.
(tool-bar-local-item, tool-bar--image-exp): Use it.
(tool-bar-setup): Initialize tool-bar-separator-image-expression.
Use :enable instead of :visible to avoid changing the tool-bar
configuration unnecessarily.

* src/keyboard.c (Vtool_bar_separator_image_expression): New variable.
(parse_tool_bar_item): Use it to obtain image separators for
displays not using native tool-bar separators.

* src/xdisp.c (build_desired_tool_bar_string): Don't handle separators
specially, since this is now done in parse_tool_bar_item.

* lisp/info.el (info-tool-bar-map): Add separators.

3 files changed, 9 insertions, 7 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 87236dc4eb2..ebd613ddfe8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * images/separator.xpm: Tweak colors.
+
 2010-12-14  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: Mention new Tramp method "ksu".
diff --git a/etc/NEWS b/etc/NEWS
index 1ec8325c2a3..89d6139dc0e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -692,9 +692,7 @@ input.
 
 ** Tool-bars can display separators.
 Tool-bar separators are handled like menu separators in menu-bar maps,
-i.e. with entries of the form `(menu-item "--")'.
-
-Currently, tool-bar separators are only displayed on GTK.
+i.e. via menu entries of the form `(menu-item "--")'.
 
 ** Image API
 
diff --git a/etc/images/separator.xpm b/etc/images/separator.xpm
index 0c518fa7599..b728316a8f8 100644
--- a/etc/images/separator.xpm
+++ b/etc/images/separator.xpm
@@ -2,11 +2,12 @@
 static char * separator_xpm[] = {
 "2 24 3 1",
 "       c None",
-".      c #DBD3CB",
-"+      c #FCFBFA",
-"  ",
+".      c #888888",
+"+      c #FFFFFF",
 "  ",
 "  ",
+".+ ",
+".+",
 ".+",
 ".+",
 ".+",
@@ -25,6 +26,5 @@ static char * separator_xpm[] = {
 ".+",
 ".+",
 ".+",
-"  ",
 "  ",
 "  "};