[Emacs-diffs] Changes to emacs/src/xfaces.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.281.2.17 emacs/src/xfaces.c:1.281.2.18
*** emacs/src/xfaces.c:1.281.2.17       Wed Sep 15 09:00:02 2004
--- emacs/src/xfaces.c  Fri Nov 12 02:52:55 2004
***************
*** 3511,3518 ****
     call into lisp.  */
  
  Lisp_Object
! merge_face_heights (from, to, invalid, gcpro)
!      Lisp_Object from, to, invalid, gcpro;
  {
    Lisp_Object result = invalid;
  
--- 3511,3518 ----
     call into lisp.  */
  
  Lisp_Object
! merge_face_heights (from, to, invalid)
!      Lisp_Object from, to, invalid;
  {
    Lisp_Object result = invalid;
  
***************
*** 3537,3552 ****
        /* Call function with current height as argument.
         From is the new height.  */
        Lisp_Object args[2];
-       struct gcpro gcpro1;
- 
-       GCPRO1 (gcpro);
  
        args[0] = from;
        args[1] = to;
        result = safe_call (2, args);
  
-       UNGCPRO;
- 
        /* Ensure that if TO was absolute, so is the result.  */
        if (INTEGERP (to) && !INTEGERP (result))
        result = invalid;
--- 3537,3547 ----
***************
*** 3599,3606 ****
      if (!UNSPECIFIEDP (from[i]))
        {
        if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
!         to[i] = merge_face_heights (from[i], to[i], to[i],
!                                     named_merge_points);
        else
          to[i] = from[i];
        }
--- 3594,3600 ----
      if (!UNSPECIFIEDP (from[i]))
        {
        if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
!         to[i] = merge_face_heights (from[i], to[i], to[i]);
        else
          to[i] = from[i];
        }
***************
*** 3627,3637 ****
    if (push_named_merge_point (&named_merge_point,
                              face_name, &named_merge_points))
      {
        Lisp_Object from[LFACE_VECTOR_SIZE];
        int ok = get_lface_attributes (f, face_name, from, 0);
  
        if (ok)
!       merge_face_vectors (f, from, to, named_merge_points);
  
        return ok;
      }
--- 3621,3636 ----
    if (push_named_merge_point (&named_merge_point,
                              face_name, &named_merge_points))
      {
+       struct gcpro gcpro1;
        Lisp_Object from[LFACE_VECTOR_SIZE];
        int ok = get_lface_attributes (f, face_name, from, 0);
  
        if (ok)
!       {
!         GCPRO1 (named_merge_point.face_name);
!         merge_face_vectors (f, from, to, named_merge_points);
!         UNGCPRO;
!       }
  
        return ok;
      }
***************
*** 3722,3729 ****
              else if (EQ (keyword, QCheight))
                {
                  Lisp_Object new_height =
!                   merge_face_heights (value, to[LFACE_HEIGHT_INDEX],
!                                       Qnil, Qnil);
  
                  if (! NILP (new_height))
                    to[LFACE_HEIGHT_INDEX] = new_height;
--- 3721,3727 ----
              else if (EQ (keyword, QCheight))
                {
                  Lisp_Object new_height =
!                   merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil);
  
                  if (! NILP (new_height))
                    to[LFACE_HEIGHT_INDEX] = new_height;
***************
*** 4110,4116 ****
                  /* The default face must have an absolute size,
                     otherwise, we do a test merge with a random
                     height to see if VALUE's ok. */
!                 : merge_face_heights (value, make_number (10), Qnil, Qnil));
  
          if (!INTEGERP (test) || XINT (test) <= 0)
            signal_error ("Invalid face height", value);
--- 4108,4114 ----
                  /* The default face must have an absolute size,
                     otherwise, we do a test merge with a random
                     height to see if VALUE's ok. */
!                 : merge_face_heights (value, make_number (10), Qnil));
  
          if (!INTEGERP (test) || XINT (test) <= 0)
            signal_error ("Invalid face height", value);
***************
*** 4824,4830 ****
    if (EQ (value1, Qunspecified))
      return value2;
    else if (EQ (attribute, QCheight))
!     return merge_face_heights (value1, value2, value1, Qnil);
    else
      return value1;
  }
--- 4822,4828 ----
    if (EQ (value1, Qunspecified))
      return value2;
    else if (EQ (attribute, QCheight))
!     return merge_face_heights (value1, value2, value1);
    else
      return value1;
  }