*** empty log message ***

2 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4db9aaad655..eec17efea2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-04  Mario Lang  <mlang@delysid.org>
+
+        * battery.el (battery-linux-proc-acpi): mA was hardcored, but some
+        systems appear to use mW, make the code handle this.  Fix a
+        division-by-zero bug while at it, and handle kernels with
+        a slightly different layout in /proc/acpi.
+
 2004-06-03  Karl Fogel  <kfogel@red-bean.com>
 
         * vc-svn.el (vc-svn-checkin): Use 'nconc' instead of 'list*',
diff --git a/src/ChangeLog b/src/ChangeLog
index 5c87b950403..7b3acf8f578 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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