* toolbar/tool-bar.el (tool-bar-local-item)

  (tool-bar-local-item-from-menu): Try to use icons with fewer colors
  if display-color-cells is 256 or less.

diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 6b890e5078f9ba7ce261b53fc7a11b1e902508e0..7ded78b80e12d09b8f7692f0478f7b01e5600002 100644 (file)
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -118,18 +118,17 @@ ICON.xbm, using `find-image'."
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
+        (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
+        (xpm-lo-spec (if (> (display-color-cells) 256)
+                         nil
+                       (list :type 'xpm :file (concat icon ".xpm"))))
+        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
+        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
         (image (find-image
                (if (display-color-p)
-                   (list (list :type 'xpm :file (concat icon ".xpm"))
-                         (append (list :type 'pbm :file (concat icon ".pbm"))
-                                 colors)
-                         (append (list :type 'xbm :file (concat icon ".xbm"))
-                                 colors))
-                 (list (append (list :type 'pbm :file (concat icon ".pbm"))
-                               colors)
-                       (append (list :type 'xbm :file (concat icon ".xbm"))
-                               colors)
-                       (list :type 'xpm :file (concat icon ".xpm")))))))
+                   (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
+                 (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))))
+
     (when (and (display-images-p) image)
       (unless (image-mask-p image)
        (setq image (append image '(:mask heuristic))))
@@ -170,17 +169,15 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
+        (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
+        (xpm-lo-spec (if (> (display-color-cells) 256)
+                         nil
+                       (list :type 'xpm :file (concat icon "-locol.xpm"))))
+        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
+        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
         (spec (if (display-color-p)
-                  (list (list :type 'xpm :file (concat icon ".xpm"))
-                        (append (list :type 'pbm :file (concat icon ".pbm"))
-                                      colors)
-                        (append (list :type 'xbm :file (concat icon ".xbm"))
-                                      colors))
-                (list (append (list :type 'pbm :file (concat icon ".pbm"))
-                                    colors)
-                      (append (list :type 'xbm :file (concat icon ".xbm"))
-                                    colors)
-                      (list :type 'xpm :file (concat icon ".xpm")))))
+                  (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
+                (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
         (image (find-image spec))
         submap key)
     (when (and (display-images-p) image)