[debbugs-tracker] bug#17319: closed (24.3.50; Error when battery-status-function reports "N/A")

[GNU bug Tracking System]

Your message dated Sun, 27 Apr 2014 20:23:43 -0400
with message-id <address@hidden>
and subject line Re: bug#17319: 24.3.50; Error when battery-status-function 
reports "N/A"
has caused the debbugs.gnu.org bug report #17319,
regarding 24.3.50; Error when battery-status-function reports "N/A"
to be marked as done.

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


-- 
17319: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17319
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> 24.3.50; Error when battery-status-function reports "N/A"
>
>
>
>
> Date: 
>
> Wed, 23 Apr 2014 07:29:42 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)
>
>
>
>
> Hello,
>
> When I open the lid of my laptop, it might happen that the percentage is
> "N/A". battery.el assumed it is a number. I suggest the following patch
> to avoid the lisp error (sorry I did not save the backtrace).
>
> In GNU Emacs 24.3.50.7 (i686-pc-linux-gnu, GTK+ Version 2.24.20)
>  of 2014-04-10 on LDLC-portable
> Windowing system distributor `The X.Org Foundation', version 11.0.11405000
> System Description:     Ubuntu 13.10
>
> Configured using:
>  `configure 'CFLAGS=-g3 -O2''
>
> Important settings:
>   value of $LANG: fr_BE.UTF-8
>   locale-coding-system: utf-8-unix
>
>
>
> 2 files changed, 16 insertions(+), 9 deletions(-)
>  lisp/ChangeLog  |  4 ++++
>  lisp/battery.el | 21 ++++++++++++---------
>
>         Modified   lisp/ChangeLog
> diff --git a/lisp/ChangeLog b/lisp/ChangeLog
> index a31aa5d..d81712f 100644
> --- a/lisp/ChangeLog
> +++ b/lisp/ChangeLog
> @@ -1,3 +1,7 @@
> +2014-04-11  Nicolas Richard  <address@hidden>
> +
> +       * battery.el (battery-update): Handle the case where battery
> +       status is "N/A".
>  2014-04-23  Stefan Monnier  <address@hidden>
>  
>         * simple.el (completion-list-mode-map): Use choose-completion for the
>         Modified   lisp/battery.el
> diff --git a/lisp/battery.el b/lisp/battery.el
> index 1eef80a..768ed78 100644
> --- a/lisp/battery.el
> +++ b/lisp/battery.el
> @@ -201,19 +201,22 @@ seconds."
>  
>  (defun battery-update ()
>    "Update battery status information in the mode line."
> -  (let ((data (and battery-status-function (funcall battery-status-function))))
> +  (let* ((data (and battery-status-function (funcall battery-status-function)))
> +         (percentage (car (read-from-string (cdr (assq ?p data))))))
>      (setq battery-mode-line-string
>           (propertize (if (and battery-mode-line-format
> -                              (<= (car (read-from-string (cdr (assq ?p data))))
> -                                  battery-mode-line-limit))
> -                         (battery-format
> -                          battery-mode-line-format
> -                          data)
> +                              (or
> +                                (not (numberp percentage))
> +                                (<= percentage
> +                                    battery-mode-line-limit)))
> +                         (battery-format battery-mode-line-format data)
>                         "")
>                       'face
> -                     (and (<= (car (read-from-string (cdr (assq ?p data))))
> -                                  battery-load-critical)
> -                          'error)
> +                     (or
> +                       (not (numberp percentage))
> +                       (and (<= percentage
> +                                battery-load-critical)
> +                            'error))
>                       'help-echo "Battery status information")))
>    (force-mode-line-update))
>  
> -- 
> Nico.
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#17319: 24.3.50; Error when battery-status-function reports "N/A"
>
>
>
>
> Date: 
>
> Sun, 27 Apr 2014 20:23:43 -0400
>
>
>
>
> User-agent: 
>
> Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
>
>
>
>
> Version: 24.4
>
> Looks like this was applied.
>
>
> --- End Message ---