changeset 94899:29fb4d52c079

(tool-bar-make-keymap): Additional minor fix.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 13 May 2008 18:02:44 +0000
parents d559b7ab8765
children 1be259966433
files lisp/tool-bar.el
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)