mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

* lisp/battery.el (battery-update): Handle the case where battery

Browse Source 
status is "N/A".

Fixes: debbugs:17319
This commit is contained in:
Nicolas Richard 2014-04-25 14:01:18 -04:00 committed by Stefan Monnier
parent 844465d6ca
commit 0507406b6c
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -1,7 +1,12 @@
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>

17
lisp/battery.el
View File

@ -201,19 +201,18 @@ 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)
(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))