From: Pavel Janík <Pavel@Janik.cz>
Date: Fri, 9 Nov 2001 06:47:21 +0000 (+0000)
Subject: (merge_face_vectors): Use braces to follow GNU Coding Standards.
X-Git-Tag: ttn-vms-21-2-B4~18735
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab8469eb87c14e38dda7560b374be7b971d3d334;p=emacs.git

(merge_face_vectors): Use braces to follow GNU Coding Standards.
(Finternal_set_lisp_face_attribute): Likewise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 90ea2c07707..c0f15df7fb3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-11-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+	* xfaces.c (merge_face_vectors): Use braces to follow GNU
+	Coding Standards.
+	(Finternal_set_lisp_face_attribute): Likewise.
+
 	* indent.c (current_column_1): Remove unused variable `prev_col'.
 
 2001-11-07  Jason Rumney  <jasonr@gnu.org>
diff --git a/src/xfaces.c b/src/xfaces.c
index afbf3e92d08..2bf3eae7bdf 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3310,10 +3310,12 @@ merge_face_vectors (f, from, to, cycle_check)
 
   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 @@ FRAME 0 means change the face on all frames, and change the default
 	}
 
       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;