From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 15 Sep 2000 21:00:32 +0000 (+0000)
Subject: (toolbar-add-item): Use the same image
X-Git-Tag: emacs-pretest-21.0.90~1578
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b26ac776d715d99a2215dfe5df4009b18076a4a;p=emacs.git

(toolbar-add-item): Use the same image
specification if or if not tool-bar item contains an `:enabled'
property.
---

diff --git a/lisp/toolbar/toolbar.el b/lisp/toolbar/toolbar.el
index c58e617f3dc..bdd0d8a4385 100644
--- a/lisp/toolbar/toolbar.el
+++ b/lisp/toolbar/toolbar.el
@@ -75,10 +75,7 @@ Info node `(elisp)Image Descriptors')."
 			     (:type xpm :file ,(concat icon ".xpm"))))))
     (when image
       (unless (image-mask-p image)
-	(setq image (append image '(:mask heuristict))))
-      (if (memq :enable props)
-	  (let ((dis (append image '(:algorithm laplace))))
-	    (setq image (vector image image dis dis))))
+	(setq image (append image '(:mask heuristic))))
       (define-key-after (or map toolbar-global-map) (vector key)
 	`(menu-item ,(symbol-name key) ,def :image ,image ,@props)))))