mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
primitives if the display doesn't support images.
This commit is contained in:
Eli Zaretskii 2001-07-17 12:59:14 +00:00
parent ddc456e4ec
commit 196de866ae
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/toolbar/tool-bar.el
View file

@ -105,7 +105,7 @@ function."
(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 @@ 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)