From: Masashi Fujimoto <masfj.dev@gmail.com>
Date: Wed, 23 Oct 2013 19:44:28 +0000 (-0400)
Subject: * lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change)
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1170
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d5f1282f05c6ea7ad7abb9c27d784e09faa45e4a

* lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change)

Fixes: debbugs:15694
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6210bbeaba..926bd1091c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-23  Masashi Fujimoto  <masfj.dev@gmail.com>  (tiny change)
+
+	* battery.el (battery-pmset): Handle OS X Mavericks.  (Bug#15694)
+
 2013-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of
diff --git a/lisp/battery.el b/lisp/battery.el
index d4e4d8b3a3..780278fc09 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -615,7 +615,7 @@ The following %-sequences are provided:
     (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)
+      (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\\}\\)%")