[Emacs-diffs] emacs-24 r116834: Backport Yeeloong battery.el fix from trunk

[Glenn Morris]

------------------------------------------------------------
revno: 116834
revision-id: address@hidden
parent: address@hidden
author: Richard Stallman <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-03-22 17:08:47 -0700
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/battery.el                battery.el-20091113204419-o5vbwnq5f7feedwu-1189

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-22 08:43:30 +0000
+++ b/lisp/ChangeLog    2014-03-23 00:08:47 +0000
@@ -1,3 +1,8 @@
+2014-03-23  Richard Stallman  <address@hidden>
+
+       * battery.el (battery-linux-sysfs): Search for each field
+       from the beginning of the buffer.
+
 2014-03-22  Dmitry Gutov  <address@hidden>
 
        * emacs-lisp/package.el (package-desc): Use the contents of the

=== modified file 'lisp/battery.el'
--- a/lisp/battery.el   2014-01-01 07:43:34 +0000
+++ b/lisp/battery.el   2014-03-23 00:08:47 +0000
@@ -458,12 +458,15 @@
          (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 @@
                                        (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