From 0722292b2057d8de5c4b845ef48508a6eceac5b8 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 6 Jun 2004 09:49:12 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem --- src/ChangeLog | 5 +++++ src/xfaces.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 8f1d7f3d54d..f639f384dcc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-06-06 Miles Bader + + * xfaces.c (Fdisplay_supports_face_attributes_p): Give up + immediately if non-interactive or not initialized. + 2004-06-05 Richard M. Stallman * minibuf.c (Fcompleting_read): Doc fix. diff --git a/src/xfaces.c b/src/xfaces.c index fc665ce3bd5..d2cf2e24d08 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6027,6 +6027,12 @@ face for italic. */) 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)) -- 2.39.5