summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-05-13 18:02:44 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-05-13 18:02:44 +0000
commit6a9cbb8592b19d2abd9c75cc307a0813322a5002 (patch)
tree81594f7109ed95925c24ff47a16f4d49a9b50ebc /lisp
parentbbfc05182a17a8af53e1191340272c1c3e63cdfa (diff)
downloademacs-6a9cbb8592b19d2abd9c75cc307a0813322a5002.tar.gz
(tool-bar-make-keymap): Additional minor fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/tool-bar.el2
1 files changed, 1 insertions, 1 deletions
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)