Fix compatibility with macOS 10.12 pmset (bug#24537)

* lisp/battery.el (battery-pmset): Recognise and ignore battery id if
present in output.
This commit is contained in:
Alan Third 2016-09-29 20:22:00 +01:00
parent f4eb890029
commit 25dca60d5e

View file

@ -625,7 +625,7 @@ The following %-sequences are provided:
(goto-char (point-min))
(when (re-search-forward "\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'" nil t)
(setq power-source (match-string 1))
(when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t)
(when (re-search-forward "^ -InternalBattery-0\\([ \t]+(id=[0-9]+)\\)*[ \t]+" nil t)
(when (looking-at "\\([0-9]\\{1,3\\}\\)%")
(setq load-percentage (match-string 1))
(goto-char (match-end 0))