[Emacs-diffs] Changes to emacs/lisp/tool-bar.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/05/13 18:02:47

Index: tool-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tool-bar.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tool-bar.el 13 May 2008 17:52:31 -0000      1.15
+++ tool-bar.el 13 May 2008 18:02:44 -0000      1.16
@@ -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)