mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-08 20:58:58 +00:00
(hilit-lookup-face-create): Don't set face colors
to nil.
This commit is contained in:
parent
d9c4f922fb
commit
bd38a99868
@ -622,8 +622,8 @@ See the documentation for hilit-translate and hilit-face-translation-table."
|
|||||||
|
|
||||||
;; catch errors if we can't allocate the color(s)
|
;; catch errors if we can't allocate the color(s)
|
||||||
(condition-case nil
|
(condition-case nil
|
||||||
(progn (set-face-foreground 'scratch-face fgcolor)
|
(progn (and fgcolor (set-face-foreground 'scratch-face fgcolor))
|
||||||
(set-face-background 'scratch-face bgcolor)
|
(and bgcolor (set-face-background 'scratch-face bgcolor))
|
||||||
(copy-face 'scratch-face face)
|
(copy-face 'scratch-face face)
|
||||||
(put face 'basefont basefont))
|
(put face 'basefont basefont))
|
||||||
(error (message "couldn't allocate color for '%s'"
|
(error (message "couldn't allocate color for '%s'"
|
||||||
@ -635,7 +635,7 @@ See the documentation for hilit-translate and hilit-face-translation-table."
|
|||||||
;; we wanted, but ignore errors making the face bold or italic
|
;; we wanted, but ignore errors making the face bold or italic
|
||||||
;; if the font isn't available, there's nothing to do about it...
|
;; if the font isn't available, there's nothing to do about it...
|
||||||
(progn
|
(progn
|
||||||
(set-face-font face nil frame)
|
(set-face-font face basefont frame)
|
||||||
(set-face-underline-p face (string-match "underline" fn))
|
(set-face-underline-p face (string-match "underline" fn))
|
||||||
(if (string-match ".*bold" fn)
|
(if (string-match ".*bold" fn)
|
||||||
;; make face bold in all frames
|
;; make face bold in all frames
|
||||||
|
Loading…
x
Reference in New Issue
Block a user