Mercurial > emacs

changeset 55949:50599d471b66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem
author Miles Bader <miles@gnu.org>
date Sun, 06 Jun 2004 09:49:12 +0000
parents 424252fc748e
children 7b87eb54c885
files src/ChangeLog src/xfaces.c
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Jun 06 03:45:59 2004 +0000
+++ b/src/ChangeLog	Sun Jun 06 09:49:12 2004 +0000
@@ -1,3 +1,8 @@
+2004-06-06  Miles Bader  <miles@gnu.org>
+
+	* xfaces.c (Fdisplay_supports_face_attributes_p): Give up
+	immediately if non-interactive or not initialized.
+
 2004-06-05  Richard M. Stallman  <rms@gnu.org>
 
 	* minibuf.c (Fcompleting_read): Doc fix.
--- a/src/xfaces.c	Sun Jun 06 03:45:59 2004 +0000
+++ b/src/xfaces.c	Sun Jun 06 09:49:12 2004 +0000
@@ -6027,6 +6027,12 @@
   struct face *def_face;
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
 
+  if (noninteractive || !initialized)
+    /* We may not be able to access low-level face information in batch
+       mode, or before being dumped, and this function is not going to
+       be very useful in those cases anyway, so just give up.  */
+    return Qnil;
+
   if (NILP (display))
     frame = selected_frame;
   else if (FRAMEP (display))