Mercurial > emacs
changeset 10380:6bf5b024dffb
(show-paren-command-hook): Don't alter paren-mismatch face
if make-face gives it some contents.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 10 Jan 1995 17:44:28 +0000 |
| parents | f9d713e8c77c |
| children | 8e8259e052ed |
| files | lisp/paren.el |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/paren.el Tue Jan 10 17:43:59 1995 +0000 +++ b/lisp/paren.el Tue Jan 10 17:44:28 1995 +0000 @@ -80,14 +80,15 @@ (progn (and (null show-paren-mismatch-face) (x-display-color-p) - (or (internal-find-face 'paren-mismatch) - (progn - (make-face 'paren-mismatch) - (set-face-background 'paren-mismatch - "purple") - (set-face-foreground 'paren-mismatch - "white"))) - (setq show-paren-mismatch-face 'paren-mismatch)) + (progn + (make-face 'paren-mismatch) + (or (face-nontrivial-p 'paren-mismatch t) + (progn + (set-face-background 'paren-mismatch + "purple") + (set-face-foreground 'paren-mismatch + "white"))) + (setq show-paren-mismatch-face 'paren-mismatch))) (if show-paren-mismatch-face (setq face show-paren-mismatch-face) (message "Paren mismatch"))))