Subject: Re: bug#15694: battery.el for Mac OS X Mavericks
From: Glenn Morris <[email-masked]>
To: [email-masked]
Date: Wed, 23 Oct 2013 15:45:14 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Version: 24.4

Applied with a tweak (shy group).

*** lisp/battery.el	2013-03-05 17:13:01 +0000
--- lisp/battery.el	2013-10-23 19:41:17 +0000
***************
*** 615,621 ****
      (with-temp-buffer
        (ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
        (goto-char (point-min))
!       (when (re-search-forward "Currentl?y drawing from '\\(AC\\|Battery\\) Power'" nil t)
  	(setq power-source (match-string 1))
  	(when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t)
  	  (when (looking-at "\\([0-9]\\{1,3\\}\\)%")
--- 615,621 ----
      (with-temp-buffer
        (ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
        (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 (looking-at "\\([0-9]\\{1,3\\}\\)%")