# HG changeset patch
# User Pavel Jan���k <Pavel@Janik.cz>
# Date 1005288382 0
# Node ID bf08eafda9a3fa29e9a44375d6bb3ba675a4ccd9
# Parent  49b732d9bf2777d971d340df34244049a2c2a3a6
(merge_face_vectors): Use braces to follow GNU Coding Standards.
(Finternal_set_lisp_face_attribute): Likewise.

diff -r 49b732d9bf27 -r bf08eafda9a3 src/xfaces.c
--- a/src/xfaces.c	Fri Nov 09 06:22:21 2001 +0000
+++ b/src/xfaces.c	Fri Nov 09 06:46:22 2001 +0000
@@ -3310,10 +3310,12 @@
 
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (!UNSPECIFIEDP (from[i]))
-      if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
-	to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
-      else
-	to[i] = from[i];
+      {
+	if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
+	  to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
+	else
+	  to[i] = from[i];
+      }
 
   /* TO is always an absolute face, which should inherit from nothing.
      We blindly copy the :inherit attribute above and fix it up here.  */
@@ -4185,20 +4187,22 @@
 	}
 
       if (!NILP (param))
-	if (EQ (frame, Qt))
-	  /* Update `default-frame-alist', which is used for new frames.  */
-	  {
-	    store_in_alist (&Vdefault_frame_alist, param, value);
-	  }
-	else
-	  /* Update the current frame's parameters.  */
-	  {
-	    Lisp_Object cons;
-	    cons = XCAR (Vparam_value_alist);
-	    XSETCAR (cons, param);
-	    XSETCDR (cons, value);
-	    Fmodify_frame_parameters (frame, Vparam_value_alist);
-	  }
+	{
+	  if (EQ (frame, Qt))
+	    /* Update `default-frame-alist', which is used for new frames.  */
+	    {
+	      store_in_alist (&Vdefault_frame_alist, param, value);
+	    }
+	  else
+	    /* Update the current frame's parameters.  */
+	    {
+	      Lisp_Object cons;
+	      cons = XCAR (Vparam_value_alist);
+	      XSETCAR (cons, param);
+	      XSETCDR (cons, value);
+	      Fmodify_frame_parameters (frame, Vparam_value_alist);
+	    }
+	}
     }
 
   return face;