Mercurial > emacs

changeset 38470:b8361f155685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(tool-bar-add-item-from-menu, tool-bar-add-item): Don't call image-related primitives if the display doesn't support images.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 17 Jul 2001 12:59:14 +0000
parents 38c0279a4af4
children 83fa544a8070
files lisp/toolbar/tool-bar.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/toolbar/tool-bar.el	Tue Jul 17 12:58:19 2001 +0000
+++ b/lisp/toolbar/tool-bar.el	Tue Jul 17 12:59:14 2001 +0000
@@ -105,7 +105,7 @@
 			(append (list :type 'xbm :file (concat icon ".xbm"))
 				colors)
 			(list :type 'xpm :file (concat icon ".xpm")))))))
-    (when image
+    (when (and (display-images-p) image)
       (unless (image-mask-p image)
 	(setq image (append image '(:mask heuristic))))
       (define-key-after tool-bar-map (vector key)
@@ -144,7 +144,7 @@
 		       (list :type 'xpm :file (concat icon ".xpm")))))
 	 (image (find-image spec))
 	 submap key)
-    (when image
+    (when (and (display-images-p) image)
       ;; We'll pick up the last valid entry in the list of keys if
       ;; there's more than one.
       (dolist (k keys)