# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1209430777 0
# Node ID 2ecc5f11442914c4bc4ac8962ea50ba934166f19
# Parent  a96dda54aef3ed32d646c6147cac4ccffc780b93
*** empty log message ***

diff -r a96dda54aef3 -r 2ecc5f114429 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 29 00:58:55 2008 +0000
+++ b/lisp/ChangeLog	Tue Apr 29 00:59:37 2008 +0000
@@ -1,3 +1,11 @@
+2008-04-29  Jason Rumney  <jasonr@gnu.org>
+
+	* battery.el (battery-status-function): Use w32-battery-status
+	on Windows.
+	(battery-echo-area-format): Make apm format the general case.
+	(battery-mode-line-format): Merge apm and pmset formats as the
+	general case.
+
 2008-04-29  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-info-stack-custom): Use