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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/07/05 21:16:06

Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -b -r1.402 -r1.403
--- xfaces.c    30 Jun 2008 02:12:47 -0000      1.402
+++ xfaces.c    5 Jul 2008 21:16:05 -0000       1.403
@@ -3971,6 +3971,9 @@
       struct face *newface, *oldface = FACE_FROM_ID (f, DEFAULT_FACE_ID);
       Lisp_Object attrs[LFACE_VECTOR_SIZE];
 
+      /* This can be NULL (e.g., in batch mode).  */
+      if (oldface)
+       {
       bcopy (oldface->lface, attrs, sizeof attrs);
       merge_face_vectors (f, lvec, attrs, 0);
       newface = realize_face (c, attrs, DEFAULT_FACE_ID);
@@ -3989,6 +3992,7 @@
                                                  Qnil));
        }
     }
+    }
 
   return Qnil;
 }