aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/battery.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8be2f6025e..6bd1ef21ea5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12000-10-09 Thien-Thi Nguyen <ttn@gnu.org> 12000-10-09 Thien-Thi Nguyen <ttn@gnu.org>
2 2
3 * battery.el (display-battery): Doc spelling fix.
4
3 * vc.el (with-vc-file, edit-vc-file): Specify `indent-function' 5 * vc.el (with-vc-file, edit-vc-file): Specify `indent-function'
4 property. 6 property.
5 7
diff --git a/lisp/battery.el b/lisp/battery.el
index 4e966d69c61..d8171874c3d 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -42,7 +42,7 @@
42(defcustom battery-status-function 42(defcustom battery-status-function
43 (cond ((and (eq system-type 'gnu/linux) 43 (cond ((and (eq system-type 'gnu/linux)
44 (file-readable-p "/proc/apm")) 44 (file-readable-p "/proc/apm"))
45 'battery-linux-proc-apm)) 45 'battery-linux-proc-apm))
46 "*Function for getting battery status information. 46 "*Function for getting battery status information.
47The function have to return an alist of conversion definitions. 47The function have to return an alist of conversion definitions.
48Cons cells are of the form 48Cons cells are of the form
@@ -101,7 +101,7 @@ The text being displayed in the echo area is controlled by the variables
101;;;###autoload 101;;;###autoload
102(defun display-battery () 102(defun display-battery ()
103 "Display battery status information in the mode line. 103 "Display battery status information in the mode line.
104The text beeing displayed in the mode line is controlled by the variables 104The text being displayed in the mode line is controlled by the variables
105`battery-mode-line-format' and `battery-status-function'. 105`battery-mode-line-format' and `battery-status-function'.
106The mode line will be updated automatically every `battery-update-interval' 106The mode line will be updated automatically every `battery-update-interval'
107seconds." 107seconds."