[Emacs-diffs] /srv/bzr/emacs/trunk r105569: * lisp/battery.el (display-battery-mode): If `battery-status-function'

[Juri Linkov]

------------------------------------------------------------
revno: 105569
fixes bug(s): http://debbugs.gnu.org/9363
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2011-08-25 22:49:57 +0300
message:
  * lisp/battery.el (display-battery-mode): If `battery-status-function'
  or `battery-mode-line-format' is nil, display the message and set
  `display-battery-mode' to nil.
modified:
  lisp/ChangeLog
  lisp/battery.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-25 10:45:33 +0000
+++ b/lisp/ChangeLog    2011-08-25 19:49:57 +0000
@@ -1,3 +1,9 @@
+2011-08-25  Juri Linkov  <address@hidden>
+
+       * battery.el (display-battery-mode): If `battery-status-function'
+       or `battery-mode-line-format' is nil, display the message and set
+       `display-battery-mode' to nil (bug#9363).
+
 2011-08-25  Eli Zaretskii  <address@hidden>
 
        * buff-menu.el (Buffer-menu-buffer+size): Remove calls to

=== modified file 'lisp/battery.el'
--- a/lisp/battery.el   2011-08-24 18:09:18 +0000
+++ b/lisp/battery.el   2011-08-25 19:49:57 +0000
@@ -173,13 +173,16 @@
   (setq battery-mode-line-string "")
   (or global-mode-string (setq global-mode-string '("")))
   (and battery-update-timer (cancel-timer battery-update-timer))
-  (if (not display-battery-mode)
-      (setq global-mode-string
-           (delq 'battery-mode-line-string global-mode-string))
-    (add-to-list 'global-mode-string 'battery-mode-line-string t)
-    (setq battery-update-timer (run-at-time nil battery-update-interval
-                                           'battery-update-handler))
-    (battery-update)))
+  (if (and battery-status-function battery-mode-line-format)
+      (if (not display-battery-mode)
+         (setq global-mode-string
+               (delq 'battery-mode-line-string global-mode-string))
+       (add-to-list 'global-mode-string 'battery-mode-line-string t)
+       (setq battery-update-timer (run-at-time nil battery-update-interval
+                                               'battery-update-handler))
+       (battery-update))
+    (message "Battery status not available")
+    (setq display-battery-mode nil)))
 
 (defun battery-update-handler ()
   (battery-update)