# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1210701764 0
# Node ID 29fb4d52c07937532e90bdc557310169c5faa3ed
# Parent  d559b7ab87656106de52e37c16a7375072ce050f
(tool-bar-make-keymap): Additional minor fix.

diff -r d559b7ab8765 -r 29fb4d52c079 lisp/tool-bar.el
--- a/lisp/tool-bar.el	Tue May 13 17:53:04 2008 +0000
+++ b/lisp/tool-bar.el	Tue May 13 18:02:44 2008 +0000
@@ -106,7 +106,7 @@
 		(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)