all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
To: 17319@debbugs.gnu.org
Subject: bug#17319: 24.3.50; Error when battery-status-function reports "N/A"
Date: Wed, 23 Apr 2014 07:29:42 +0200	[thread overview]
Message-ID: <87eh0owr3t.fsf@yahoo.fr> (raw)

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  <theonewiththeevillook@yahoo.fr>
+
+	* battery.el (battery-update): Handle the case where battery
+	status is "N/A".
 2014-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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))
 \f
-- 
Nico.





             reply	other threads:[~2014-04-23  5:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-23  5:29 Nicolas Richard [this message]
2014-04-25 18:02 ` bug#17319: 24.3.50; Error when battery-status-function reports "N/A" Stefan Monnier
2014-04-28  0:23 ` Glenn Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eh0owr3t.fsf@yahoo.fr \
    --to=theonewiththeevillook@yahoo.fr \
    --cc=17319@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.