Commit 9e37f3b9 authored by Richard M. Stallman's avatar Richard M. Stallman Committed by Glenn Morris

Backport Yeeloong battery.el fix from trunk

Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00782.html

* lisp/battery.el (battery-linux-sysfs):
Search for each field from the beginning of the buffer.
parent 3e702d16
2014-03-23 Richard Stallman <rms@gnu.org>
* battery.el (battery-linux-sysfs): Search for each field
from the beginning of the buffer.
2014-03-22 Dmitry Gutov <dgutov@yandex.ru>
* emacs-lisp/package.el (package-desc): Use the contents of the
......
......@@ -458,12 +458,15 @@ The following %-sequences are provided:
(and (re-search-forward "POWER_SUPPLY_STATUS=\\(.*\\)$" nil t)
(member charging-state '("Unknown" "Full" nil))
(setq charging-state (match-string 1)))
(goto-char (point-min))
(when (re-search-forward
"POWER_SUPPLY_\\(CURRENT\\|POWER\\)_NOW=\\([0-9]*\\)$"
nil t)
(setq rate (float (string-to-number (match-string 2)))))
(goto-char (point-min))
(when (re-search-forward "POWER_SUPPLY_TEMP=\\([0-9]*\\)$" nil t)
(setq temperature (match-string 1)))
(goto-char (point-min))
(let (full-string now-string)
;; Sysfs may list either charge (mAh) or energy (mWh).
;; Keep track of both, and choose which to report later.
......@@ -477,7 +480,8 @@ The following %-sequences are provided:
(string-to-number full-string))
charge-now (+ charge-now
(string-to-number now-string))))
((and (re-search-forward
((and (progn (goto-char (point-min)) t)
(re-search-forward
"POWER_SUPPLY_ENERGY_FULL=\\([0-9]*\\)$" nil t)
(setq full-string (match-string 1))
(re-search-forward
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment