procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes: debbugs:15694
This commit is contained in:
Masashi Fujimoto 2013-10-23 15:44:28 -04:00 • committed by Glenn Morris
parent 03d44565bb
commit d5f1282f05
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

2
lisp/battery.el
View file

@ -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\\}\\)%")