Reapply Gerd's change from 2000-09-18, which seems to have gotten lost:

(tool-bar-add-item-from-menu): Like in toolbar-add-item, if image
  doesn't have a mask add a `:mask heuristic'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12bfd8907b56981f0a7d391c61f3e77ee2a0015c..4508a7e22e06d48dd0618776f8f089f724515847 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,11 @@
        hardwiring :family.
        * hi-lock.el (hi-black-hb): Likewise.
 
+       Reapply Gerd's change from 2000-09-18, which seems to have gotten lost:
+       * toolbar/tool-bar.el (tool-bar-add-item-from-menu): Like in
+       toolbar-add-item, if image doesn't have a mask add a `:mask
+       heuristic'.
+
 2000-09-19  Stefan Monnier  <monnier@cs.yale.edu>
 
        * diff-mode.el: Docstring fixes.

diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 0aeb944874c97ad27846e8f11f20e9c07a2bc4fc..ff5028a164d05baae107935ca889f5753f61a57c 100644 (file)
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -114,6 +114,8 @@ PROPS is a list of additional properties to add to the binding."
                        key kk)))))
       (when (and (symbolp submap) (boundp submap))
        (setq submap (eval submap)))
+      (unless (image-mask-p image)
+       (setq image (append image '(:mask heuristic))))
       (define-key-after tb-map (vector key)
        (append (cdr (assq key (cdr submap))) (list :image image) props)))))