# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1092696808 0
# Node ID d5801cbd92f555a17dac07205601984a63b84631
# Parent  d66d7e7354e3329c9ff7dce4669763ba12137b5e
(merge_face_ref): Specifying `unspecified' is a no-op.

diff -r d66d7e7354e3 -r d5801cbd92f5 src/xfaces.c
--- a/src/xfaces.c	Mon Aug 16 22:52:29 2004 +0000
+++ b/src/xfaces.c	Mon Aug 16 22:53:28 2004 +0000
@@ -3626,7 +3626,10 @@
 	      Lisp_Object value = XCAR (XCDR (face_ref));
 	      int err = 0;
 
-	      if (EQ (keyword, QCfamily))
+	      /* Specifying `unspecified' is a no-op.  */
+	      if (EQ (value, Qunspecified))
+		;
+	      else if (EQ (keyword, QCfamily))
 		{
 		  if (STRINGP (value))
 		    to[LFACE_FAMILY_INDEX] = value;