Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(tool-bar-add-item-from-menu): Handle case

Browse source 
that foreground and/or background colors of the face `tool-bar'
are unspecified.
This commit is contained in:
Gerd Moellmann 2000-11-27 11:28:24 +00:00
parent ec7251660f
commit 7e6369044d
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,24 +129,25 @@ function."
(setq map global-map))
(let* ((menu-bar-map (lookup-key map [menu-bar]))
(keys (where-is-internal command menu-bar-map))
(fg (face-foreground 'tool-bar))
(bg (face-background 'tool-bar))
(image (find-image
(if (display-color-p)
`((:type xpm :file ,(concat icon ".xpm"))
(:type pbm :file ,(concat icon ".pbm")
:background ,bg
:foreground ,fg)
(:type xbm :file ,(concat icon ".xbm")
:background ,bg
:foreground ,fg))
`((:type pbm :file ,(concat icon ".pbm")
:background ,bg
:foreground ,fg)
(:type xbm :file ,(concat icon ".xbm")
:background ,bg
:foreground ,fg)
(:type xpm :file ,(concat icon ".xpm"))))))
(fg (if (eq (face-foreground 'tool-bar) 'unspecified)
nil
(list :foreground (face-foreground 'tool-bar))))
(bg (if (eq (face-background 'tool-bar) 'unspecified)
nil
(list :background (face-background 'tool-bar))))
(colors (nconc fg bg))
(spec (if (display-color-p)
(list (list :type 'xpm :file (concat icon ".xpm"))
(append (list :type 'pbm :file (concat icon ".pbm"))
colors)
(append (list :type 'xbm :file (concat icon ".xbm"))
colors))
(list (append (list :type 'pbm :file (concat icon ".pbm"))
colors)
(append (list :type 'xbm :file (concat icon ".xbm"))
colors)
(list :type 'xpm :file (concat icon ".xpm")))))
(image (find-image spec))
submap key)
(when image
;; We'll pick up the last valid entry in the list of keys if