Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-366
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368
   Improve display-supports-face-attributes-p on non-ttys

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
   Rewrite face-differs-from-default-p

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
   Move `display-supports-face-attributes-p' entirely into C code

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
   Simplify face-differs-from-default-p; don't consider :stipple.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
   (tty_supports_face_attributes_p): Ensure attributes differ from default

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-185

1 files changed, 23 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fd108641f22..d9000d6dd05 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2004-06-05  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (tty_supports_face_attributes_p): Make sure the specified
+        attributes have different values than the default face.
+
+2004-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (x_supports_face_attributes_p): Make this function
+        conditional on HAVE_WINDOW_SYSTEM.
+        (Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]: Don't
+        call x_supports_face_attributes_p if it was not compiled in.
+
+2004-06-04  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (tty_supports_face_attributes_p): New function, mostly
+        from Ftty_supports_face_attributes_p.
+        (x_supports_face_attributes_p): New function.
+        (Ftty_supports_face_attributes_p): Function deleted.
+        (Fdisplay_supports_face_attributes_p): New function.
+        (syms_of_xfaces): Initialize Sdisplay_supports_face_attributes_p.
+        (face_attr_equal_p): New function
+        (lface_equal_p): Use it.
+
 2004-06-03  Juanma Barranquero  <lektu@terra.es>
 
         * w32fns.c (Fx_display_grayscale_p, Fw32_send_sys_command)