# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1144829464 0
# Node ID d153d2fdd948f17ea2de4b9a24d943fe6ed85fbf
# Parent  38a999288ac4e6b8431edcf11ef0857cf997b428
(Finternal_merge_in_global_face, try_font_list): Add
explicit braces to avoid ambiguous `else'.

diff -r 38a999288ac4 -r d153d2fdd948 src/xfaces.c
--- a/src/xfaces.c	Wed Apr 12 08:10:33 2006 +0000
+++ b/src/xfaces.c	Wed Apr 12 08:11:04 2006 +0000
@@ -4974,10 +4974,12 @@
   gvec = XVECTOR (global_lface)->contents;
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (! UNSPECIFIEDP (gvec[i]))
-      if (IGNORE_DEFFACE_P (gvec[i]))
-	lvec[i] = Qunspecified;
-      else
-	lvec[i] = gvec[i];
+      {
+	if (IGNORE_DEFFACE_P (gvec[i]))
+	  lvec[i] = Qunspecified;
+	else
+	  lvec[i] = gvec[i];
+      }
 
   return Qnil;
 }
@@ -6797,20 +6799,22 @@
 
 #ifdef MAC_OS
   if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry))
-    if (xstricmp (SDATA (registry), "mac-roman") == 0)
-      /* When realizing the default face and a font spec does not
-	 matched exactly, Emacs looks for ones with the same registry
-	 as the default font.  On the Mac, this is mac-roman, which
-	 does not work if the family is -etl-fixed, e.g.  The
-	 following widens the choices and fixes that problem.  */
-      nfonts = try_alternative_families (f, try_family, Qnil, fonts);
-    else if (SBYTES (try_family) > 0
-	     && SREF (try_family, SBYTES (try_family) - 1) != '*')
-      /* Some Central European/Cyrillic font family names have the
-	 Roman counterpart name as their prefix.  */
-      nfonts = try_alternative_families (f, concat2 (try_family,
-						     build_string ("*")),
-					 registry, fonts);
+    {
+      if (xstricmp (SDATA (registry), "mac-roman") == 0)
+	/* When realizing the default face and a font spec does not
+	   matched exactly, Emacs looks for ones with the same registry
+	   as the default font.  On the Mac, this is mac-roman, which
+	   does not work if the family is -etl-fixed, e.g.  The
+	   following widens the choices and fixes that problem.  */
+	nfonts = try_alternative_families (f, try_family, Qnil, fonts);
+      else if (SBYTES (try_family) > 0
+	       && SREF (try_family, SBYTES (try_family) - 1) != '*')
+	/* Some Central European/Cyrillic font family names have the
+	   Roman counterpart name as their prefix.  */
+	nfonts = try_alternative_families (f, concat2 (try_family,
+						       build_string ("*")),
+					   registry, fonts);
+    }
 #endif
 
   if (EQ (try_family, family))