+2014-04-25 Nicolas Richard <theonewiththeevillook@yahoo.fr>
+
+ * battery.el (battery-update): Handle the case where battery
+ status is "N/A" (bug#17319).
+
2014-04-24 Eli Zaretskii <eliz@gnu.org>
- * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use
- equal-including-properties to compare help-echo strings. (Bug#17331)
+ * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help):
+ Use equal-including-properties to compare help-echo strings (bug#17331).
2014-04-24 Leo Liu <sdl.web@gmail.com>
(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)
+ (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)
+ (and (numberp percentage)
+ (<= percentage battery-load-critical)
+ 'error)
'help-echo "Battery status information")))
(force-mode-line-update))
\f