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

Fixes: debbugs:15694

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6210bbeabae7d0beb024e5ac1071b5fb59ae5374..926bd1091c0a5d02954aff9f27c5d3103c40c576 100644 (file)
--- 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 d4e4d8b3a31340f4a861b0a4dc661e1793ee1fc3..780278fc091d5787a809b00d92768420a34bc03f 100644 (file)
--- 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\\}\\)%")