[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114761: * lisp/battery.el (battery-pmset): Handle O
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114761: * lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change) |
Date: |
Wed, 23 Oct 2013 19:44:31 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114761
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15694
author: Masashi Fujimoto <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-23 15:44:28 -0400
message:
* lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change)
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/battery.el battery.el-20091113204419-o5vbwnq5f7feedwu-1189
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-23 17:55:53 +0000
+++ b/lisp/ChangeLog 2013-10-23 19:44:28 +0000
@@ -1,3 +1,7 @@
+2013-10-23 Masashi Fujimoto <address@hidden> (tiny change)
+
+ * battery.el (battery-pmset): Handle OS X Mavericks. (Bug#15694)
+
2013-10-23 Stefan Monnier <address@hidden>
* progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of
=== modified file 'lisp/battery.el'
--- a/lisp/battery.el 2013-03-05 17:13:01 +0000
+++ b/lisp/battery.el 2013-10-23 19:44:28 +0000
@@ -615,7 +615,7 @@
(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\\}\\)%")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114761: * lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change),
Glenn Morris <=