Commit 196de866 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(tool-bar-add-item-from-menu, tool-bar-add-item): Don't call image-related

primitives if the display doesn't support images.
parent ddc456e4
......@@ -105,7 +105,7 @@ function."
(append (list :type 'xbm :file (concat icon ".xbm"))
(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 @@ function."
(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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment