# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1086365291 0
# Node ID 61bcf6d175025a6a7dcd86be7789068608794acf
# Parent  f3be7c4dc1e633632c9ecb70ae7249833bbc2cd6
*** empty log message ***

diff -r f3be7c4dc1e6 -r 61bcf6d17502 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 04 16:05:56 2004 +0000
+++ b/lisp/ChangeLog	Fri Jun 04 16:08:11 2004 +0000
@@ -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 -r f3be7c4dc1e6 -r 61bcf6d17502 src/ChangeLog
--- a/src/ChangeLog	Fri Jun 04 16:05:56 2004 +0000
+++ b/src/ChangeLog	Fri Jun 04 16:08:11 2004 +0000
@@ -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