From: Miles Bader <miles@gnu.org>
Date: Wed, 20 Sep 2000 07:18:35 +0000 (+0000)
Subject: Reapply Gerd's change from 2000-09-18, which seems to have gotten lost:
X-Git-Tag: emacs-pretest-21.0.90~1500
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ddba99ad141dec39c9149424756865e56e1c39b5;p=emacs.git

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 12bfd8907b5..4508a7e22e0 100644
--- 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 0aeb944874c..ff5028a164d 100644
--- 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)))))