From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 10 Jan 1995 17:44:28 +0000 (+0000)
Subject: (show-paren-command-hook): Don't alter paren-mismatch face
X-Git-Tag: emacs-19.34~5478
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00b05a4299c9092fcad82fdf9f0e9834269f4aa6;p=emacs.git

(show-paren-command-hook): Don't alter paren-mismatch face
if make-face gives it some contents.
---

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"))))