[debbugs-tracker] bug#15694: closed (battery.el for Mac OS X Mavericks)

[GNU bug Tracking System]

Your message dated Wed, 23 Oct 2013 15:45:14 -0400
with message-id <address@hidden>
and subject line Re: bug#15694: battery.el for Mac OS X Mavericks
has caused the debbugs.gnu.org bug report #15694,
regarding battery.el for Mac OS X Mavericks
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
15694: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15694
GNU Bug Tracking System
Contact address@hidden with problems

--- Begin Message --- Subject: battery.el for Mac OS X Mavericks Date: Thu, 24 Oct 2013 03:53:51 +0900

Because the return value of `pmset' on Mac OS X Mavericks changed, If you evaluate (display-battery-mode 1), the following error occurs.

`wrong-type-argument number-or-marker-p N/A'.

I made a patch for this issue.

Thanks for reading.

--
Masashi Fujimoto



--- battery.el 2013-01-02 05:37:17.000000000 +0900
+++ mavericks-battery.el    2013-10-23 12:11:13.000000000 +0900
@@ -543,7 +543,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\\}\\)%")

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#15694: battery.el for Mac OS X Mavericks
>
>
>
>
> Date: 
>
> Wed, 23 Oct 2013 15:45:14 -0400
>
>
>
>
> User-agent: 
>
> Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
>
>
>
>
> Version: 24.4
>
> Applied with a tweak (shy group).
>
> *** lisp/battery.el     2013-03-05 17:13:01 +0000
> --- lisp/battery.el     2013-10-23 19:41:17 +0000
> ***************
> *** 615,621 ****
>       (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)
>         (setq power-source (match-string 1))
>         (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t)
>           (when (looking-at "\\([0-9]\\{1,3\\}\\)%")
> --- 615,621 ----
>       (with-temp-buffer
>         (ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
>         (goto-char (point-min))
> !       (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\\}\\)%")
>
>
>
> --- End Message ---