*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4db9aaad655b84895997a337bbd51caf62862c66..eec17efea2e49ed6d96724e2ddc792be61076b1a 100644 (file)
--- 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 5c87b95040385320122c7156b1cb2ce1f2d79b02..7b3acf8f57843752379bac05c99f4f8af26d2051 100644 (file)
--- 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