mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

battery.el not working when multiple batteries are present

Browse source 
* battery.el (battery-linux-proc-acpi): Only one battery is
discharged at a time, but that seems to confuse battery.el when
computing `rate-type' for the battery not being discharged.

Fixes: debbugs:10332
This commit is contained in:
Dan Nicolaescu 2012-04-11 01:24:31 +02:00 • committed by Lars Magne Ingebrigtsen
parent 2a718f6fbc
commit 6a8c9eafb9
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/battery.el
View file

@ -344,14 +344,15 @@ The following %-sequences are provided:
(setq charging-state (match-string 1)))
(when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$"
nil t)
(setq rate (+ (or rate 0) (string-to-number (match-string 1)))
rate-type (or (and rate-type
(setq rate (+ (or rate 0) (string-to-number (match-string 1))))
(when (> rate 0)
(setq rate-type (or (and rate-type
(if (string= rate-type (match-string 2))
rate-type
(error
"Inconsistent rate types (%s vs. %s)"
rate-type (match-string 2))))
(match-string 2))))
(match-string 2)))))
(when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
nil t)
(setq capacity