From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 13 May 2008 18:02:44 +0000 (+0000)
Subject: (tool-bar-make-keymap): Additional minor fix.
X-Git-Tag: emacs-pretest-23.0.90~5597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a9cbb8592b19d2abd9c75cc307a0813322a5002;p=emacs.git

(tool-bar-make-keymap): Additional minor fix.
---

diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 48ad887ddd1..c47cab0af40 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -106,7 +106,7 @@ color capability and based on the available image libraries."
 		(if (not (display-images-p))
 		    (setq bind nil)
 		  (let ((image (eval image-exp)))
-		    (unless (image-mask-p image)
+		    (unless (and image (image-mask-p image))
 		      (setq image (append image '(:mask heuristic))))
 		    (setq bind (copy-sequence bind)
 			  plist (nthcdr (if (consp (nth 4 bind)) 5 4)