diff options
| author | Masashi Fujimoto | 2013-10-23 15:44:28 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-10-23 15:44:28 -0400 |
| commit | d5f1282f05c6ea7ad7abb9c27d784e09faa45e4a (patch) | |
| tree | 78d1312c55dc000d5d31916c7f41fc268fd9fe8e | |
| parent | 03d44565bbbea492e5280e153150a768ca7f2c45 (diff) | |
| download | emacs-d5f1282f05c6ea7ad7abb9c27d784e09faa45e4a.tar.gz emacs-d5f1282f05c6ea7ad7abb9c27d784e09faa45e4a.zip | |
* lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change)
Fixes: debbugs:15694
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/battery.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6210bbeabae..926bd1091c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-10-23 Masashi Fujimoto <masfj.dev@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * battery.el (battery-pmset): Handle OS X Mavericks. (Bug#15694) | ||
| 4 | |||
| 1 | 2013-10-23 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-10-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of | 7 | * progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of |
diff --git a/lisp/battery.el b/lisp/battery.el index d4e4d8b3a31..780278fc091 100644 --- a/lisp/battery.el +++ b/lisp/battery.el | |||
| @@ -615,7 +615,7 @@ The following %-sequences are provided: | |||
| 615 | (with-temp-buffer | 615 | (with-temp-buffer |
| 616 | (ignore-errors (call-process "pmset" nil t nil "-g" "ps")) | 616 | (ignore-errors (call-process "pmset" nil t nil "-g" "ps")) |
| 617 | (goto-char (point-min)) | 617 | (goto-char (point-min)) |
| 618 | (when (re-search-forward "Currentl?y drawing from '\\(AC\\|Battery\\) Power'" nil t) | 618 | (when (re-search-forward "\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'" nil t) |
| 619 | (setq power-source (match-string 1)) | 619 | (setq power-source (match-string 1)) |
| 620 | (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t) | 620 | (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t) |
| 621 | (when (looking-at "\\([0-9]\\{1,3\\}\\)%") | 621 | (when (looking-at "\\([0-9]\\{1,3\\}\\)%") |