diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-01-10 17:44:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-01-10 17:44:28 +0000 |
| commit | 9c9640998b77be77519d369d980c971186170f4c (patch) | |
| tree | 42ee1482d905952a5ce9004a7c43f975abde4fa6 /lisp/paren.el | |
| parent | c6560476878795a3714ffba11e20d9e38ec2c565 (diff) | |
| download | emacs-9c9640998b77be77519d369d980c971186170f4c.tar.gz | |
(show-paren-command-hook): Don't alter paren-mismatch face
if make-face gives it some contents.
Diffstat (limited to 'lisp/paren.el')
| -rw-r--r-- | lisp/paren.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/paren.el b/lisp/paren.el index eb108910e28..0a151d14aab 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -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")))) |