*** empty log message ***

[bpt/emacs.git] / lisp / battery.el

diff --git a/lisp/battery.el b/lisp/battery.el
index a3cc393..5980a83 100644 (file)
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,8 +1,8 @@
-;;; battery.el --- display battery status information.
+;;; battery.el --- display battery status information
 
-;; Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
 
-;; Author: Ralph Schleicher <rs@purple.UL.BaWue.DE>
+;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
 
 ;; This file is part of GNU Emacs.
@@ -26,7 +26,7 @@
 
 ;; There is at present only a function interpreting the new `/proc/apm'
 ;; file format of Linux version 1.3.58 or newer.  That is, what a lucky
-;; coincidence, exactly the interface provided by the author's labtop.
+;; coincidence, exactly the interface provided by the author's laptop.
 
 ;;; Code:
 
@@ -42,16 +42,16 @@
 (defcustom battery-status-function
   (cond ((and (eq system-type 'gnu/linux)
              (file-readable-p "/proc/apm"))
-        'battery-linux-proc-apm))  
+        'battery-linux-proc-apm))
   "*Function for getting battery status information.
-The function have to return an alist of conversion definitions.
-Cons cells are of the form
+The function has to return an alist of conversion definitions.
+Its cons cells are of the form
 
     (CONVERSION . REPLACEMENT-TEXT)
 
 CONVERSION is the character code of a \"conversion specification\"
 introduced by a `%' character in a control string."
-  :type 'function
+  :type '(choice (const nil) function)
   :group 'battery)
 
 (defcustom battery-echo-area-format
@@ -90,7 +90,7 @@ string are substituted as defined by the current value of the variable
 ;;;###autoload
 (defun battery ()
   "Display battery status information in the echo area.
-The text beeing displayed in the echo area is controlled by the variables
+The text being displayed in the echo area is controlled by the variables
 `battery-echo-area-format' and `battery-status-function'."
   (interactive)
   (message "%s" (if (and battery-echo-area-format battery-status-function)
@@ -101,16 +101,14 @@ The text beeing displayed in the echo area is controlled by the variables
 ;;;###autoload
 (defun display-battery ()
   "Display battery status information in the mode line.
-The text beeing displayed in the mode line is controlled by the variables
+The text being displayed in the mode line is controlled by the variables
 `battery-mode-line-format' and `battery-status-function'.
 The mode line will be updated automatically every `battery-update-interval'
 seconds."
   (interactive)
   (setq battery-mode-line-string "")
   (or global-mode-string (setq global-mode-string '("")))
-  (or (memq 'battery-mode-line-string global-mode-string)
-      (setq global-mode-string (append global-mode-string
-                                      '(battery-mode-line-string))))
+  (add-to-list 'global-mode-string 'battery-mode-line-string t)
   (and battery-update-timer (cancel-timer battery-update-timer))
   (setq battery-update-timer (run-at-time nil battery-update-interval
                                          'battery-update-handler))
@@ -122,12 +120,13 @@ seconds."
 
 (defun battery-update ()
   "Update battery status information in the mode line."
-  (setq battery-mode-line-string (if (and battery-mode-line-format
-                                         battery-status-function)
-                                    (battery-format
-                                     battery-mode-line-format
-                                     (funcall battery-status-function))
-                                  ""))
+  (setq battery-mode-line-string (propertize (if (and battery-mode-line-format
+                                                     battery-status-function)
+                                                (battery-format
+                                                 battery-mode-line-format
+                                                 (funcall battery-status-function))
+                                              "")
+                                            'help-echo "Battery status information"))
   (force-mode-line-update))
 
 \f
@@ -172,7 +171,7 @@ The following %-sequences are provided:
          (setq buffer (get-buffer-create " *battery*"))
          (set-buffer buffer)
          (erase-buffer)
-         (battery-insert-file-contents "/proc/apm")
+         (insert-file-contents "/proc/apm")
          (re-search-forward battery-linux-proc-apm-regexp)
          (setq driver-version (match-string 1))
          (setq bios-version (match-string 2))
@@ -243,24 +242,6 @@ The following %-sequences are provided:
        (setq result (concat result "%")))
     result))
 
-(defun battery-insert-file-contents (file-name)
-  "Insert contents of file FILE-NAME after point.
-FILE-NAME can be a non-ordinary file, for example, a named pipe.
-Return t if file exists."
-  (let ((load-read-function 'battery-read-function)
-       (load-source-file-function nil)
-       (load-path '("."))
-       (load-history nil))
-    (save-excursion
-      (load file-name nil t t))))
-
-(defun battery-read-function (&optional stream)
-  "Function for reading expressions from STREAM.
-Value is always nil."
-  (let (char)
-    (while (not (< (setq char (get-file-char)) 0))
-      (insert char))))
-
 (defconst battery-hex-map '((?0 .  0) (?1 .  1) (?2 .  2) (?3 .  3)
                            (?4 .  4) (?5 .  5) (?6 .  6) (?7 .  7)
                            (?8 .  8) (?9 .  9) (?a . 10) (?b . 11)