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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/07/08 17:27:28

Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- xfaces.c    6 Jul 2008 03:51:06 -0000       1.404
+++ xfaces.c    8 Jul 2008 17:27:28 -0000       1.405
@@ -3966,7 +3966,7 @@
     else if (! UNSPECIFIEDP (gvec[i]))
       lvec[i] = gvec[i];
 
-  /* If the default face was changed, realize it again, and update the
+  /* If the default face was changed, update the face cache and the
      `font' frame parameter.  */
   if (EQ (face, Qdefault))
     {
@@ -3977,9 +3977,12 @@
       /* This can be NULL (e.g., in batch mode).  */
       if (oldface)
        {
+         /* Ensure that the face vector is fully specified by merging
+            the previously-cached vector.  */
          bcopy (oldface->lface, attrs, sizeof attrs);
          merge_face_vectors (f, lvec, attrs, 0);
-         newface = realize_face (c, attrs, DEFAULT_FACE_ID);
+         bcopy (attrs, lvec, sizeof attrs);
+         newface = realize_face (c, lvec, DEFAULT_FACE_ID);
 
          if ((! UNSPECIFIEDP (gvec[LFACE_FAMILY_INDEX])
               || ! UNSPECIFIEDP (gvec[LFACE_FOUNDRY_INDEX])