From: Alan Third <alan@idiocy.org>
Date: Thu, 29 Sep 2016 19:22:00 +0000 (+0100)
Subject: Fix compatibility with macOS 10.12 pmset (bug#24537)
X-Git-Tag: emacs-26.0.90~1527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25dca60d5e3b2447352b7c51496baefb4ccd579d;p=emacs.git

Fix compatibility with macOS 10.12 pmset (bug#24537)

* lisp/battery.el (battery-pmset): Recognise and ignore battery id if
present in output.
---

diff --git a/lisp/battery.el b/lisp/battery.el
index 1b58489161e..e6e79b06bab 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -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))