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

[Chong Yidong]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.339 emacs/src/xfaces.c:1.340
*** emacs/src/xfaces.c:1.339    Fri Nov 18 01:48:42 2005
--- emacs/src/xfaces.c  Fri Nov 18 03:55:45 2005
***************
*** 4794,4800 ****
       (attribute, value)
       Lisp_Object attribute, value;
  {
!   if (EQ (value, Qunspecified))
      return Qt;
    else if (EQ (attribute, QCheight))
      return INTEGERP (value) ? Qnil : Qt;
--- 4794,4800 ----
       (attribute, value)
       Lisp_Object attribute, value;
  {
!   if (EQ (value, Qunspecified) || (EQ (value, Qignore_defface)))
      return Qt;
    else if (EQ (attribute, QCheight))
      return INTEGERP (value) ? Qnil : Qt;
***************
*** 4810,4816 ****
       (attribute, value1, value2)
       Lisp_Object attribute, value1, value2;
  {
!   if (EQ (value1, Qunspecified))
      return value2;
    else if (EQ (attribute, QCheight))
      return merge_face_heights (value1, value2, value1);
--- 4810,4816 ----
       (attribute, value1, value2)
       Lisp_Object attribute, value1, value2;
  {
!   if (EQ (value1, Qunspecified) || EQ (value1, Qignore_defface))
      return value2;
    else if (EQ (attribute, QCheight))
      return merge_face_heights (value1, value2, value1);