# HG changeset patch # User Richard M. Stallman # Date 789759868 0 # Node ID 6bf5b024dffb2e9d42a5b6ee028f16b4b6e89f1b # Parent f9d713e8c77cedeffe7e09fe8ca070eaf1a2ab01 (show-paren-command-hook): Don't alter paren-mismatch face if make-face gives it some contents. diff -r f9d713e8c77c -r 6bf5b024dffb lisp/paren.el --- 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"))))