diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-07-03 07:49:30 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-07-03 07:49:30 +0000 |
| commit | bd38a99868eadd096847536ae8ba3016f14463e0 (patch) | |
| tree | fed7005083554ad4b920ee89c39e021bfb6483e2 | |
| parent | d9c4f922fb7f5e8b7f7d0d5aab026cbd40816e9a (diff) | |
| download | emacs-bd38a99868eadd096847536ae8ba3016f14463e0.tar.gz | |
(hilit-lookup-face-create): Don't set face colors
to nil.
| -rw-r--r-- | lisp/hilit19.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/hilit19.el b/lisp/hilit19.el index cd192143809..a324de3b1bf 100644 --- a/lisp/hilit19.el +++ b/lisp/hilit19.el @@ -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) (condition-case nil - (progn (set-face-foreground 'scratch-face fgcolor) - (set-face-background 'scratch-face bgcolor) + (progn (and fgcolor (set-face-foreground 'scratch-face fgcolor)) + (and bgcolor (set-face-background 'scratch-face bgcolor)) (copy-face 'scratch-face face) (put face 'basefont basefont)) (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 ;; if the font isn't available, there's nothing to do about it... (progn - (set-face-font face nil frame) + (set-face-font face basefont frame) (set-face-underline-p face (string-match "underline" fn)) (if (string-match ".*bold" fn) ;; make face bold in all frames |