Fix sysfs battery display.

* battery.el (battery-echo-area-format): Display remaining time
for sysfs backend too (Bug#11269).
(battery-linux-sysfs): Fix conditional for the charge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 601e4f4f59fa6685a210f8baddeffe8a2349049a..ddd306b98dfdcc0263bfa3cb2b3dfeaf0380ee68 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-20  Dan Nicolaescu  <dann@gnu.org>
+
+       * battery.el (battery-echo-area-format): Display remaining time
+       for sysfs backend too (Bug#11269).
+       (battery-linux-sysfs): Fix conditional for the charge.
+
 2012-04-20  Chong Yidong  <cyd@gnu.org>
 
        * progmodes/gdb-mi.el (gdb): Revert 2012-04-19 change.

diff --git a/lisp/battery.el b/lisp/battery.el
index 586be9e8938ca9529c34b689fba220073813bfed..5eb22b83f85a73eea4dd3e1e46aa57017e7354dc 100644 (file)
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -78,7 +78,7 @@ introduced by a `%' character in a control string."
   (cond ((eq battery-status-function 'battery-linux-proc-acpi)
         "Power %L, battery %B at %r (%p%% load, remaining time %t)")
        ((eq battery-status-function 'battery-linux-sysfs)
-        "Power %L, battery %B (%p%% load)")
+        "Power %L, battery %B (%p%% load, remaining time %t)")
        ((eq battery-status-function 'battery-pmset)
         "%L power, battery %B (%p%% load, remaining time %t)")
        ((eq battery-status-function 'battery-yeeloong-sysfs)
@@ -509,7 +509,7 @@ The following %-sequences are provided:
                     "N/A"))
          (cons ?d (or temperature "N/A"))
          (cons ?B (or charging-state "N/A"))
-         (cons ?p (cond ((> charge-full 0)
+         (cons ?p (cond ((and (> charge-full 0) (> charge-now 0))
                          (format "%.1f"
                                  (/ (* 100 charge-now) charge-full)))
                         ((> energy-full 0)