aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-05-07 19:09:25 +0000
committerDave Love2000-05-07 19:09:25 +0000
commit4f37b78af843b8faaf5f8db9fdd552d3fbbe3be9 (patch)
tree32db7387da530fb48f5affc30ed47bdae5701925
parent64a4c526f4597d4d89ff6cac775a3a5b818ad596 (diff)
downloademacs-4f37b78af843b8faaf5f8db9fdd552d3fbbe3be9.tar.gz
emacs-4f37b78af843b8faaf5f8db9fdd552d3fbbe3be9.zip
Small doc fixes from Pavel Janic.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/time.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7715ec5dfd6..68715a4f6a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-05-07 Dave Love <fx@gnu.org>
2
3 * time.el: Small doc fixes from Pavel Janic.
4
12000-05-05 Dave Love <fx@gnu.org> 52000-05-05 Dave Love <fx@gnu.org>
2 6
3 * emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg 7 * emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg
diff --git a/lisp/time.el b/lisp/time.el
index 086ec2219dc..b9d134e0fbc 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,4 +1,4 @@
1;;; time.el --- display time and load in mode line of Emacs. 1;;; time.el --- display time, load and mail indicator in mode line of Emacs.
2 2
3;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000 Free Software Foundation, Inc.
4 4
@@ -144,12 +144,12 @@ display."
144 144
145(defvar display-time-mail-icon 145(defvar display-time-mail-icon
146 (find-image '((:type xbm :file "letter.xbm" :ascent 100))) 146 (find-image '((:type xbm :file "letter.xbm" :ascent 100)))
147 "Image specification to offer as the mail indictor on a grephic 147 "Image specification to offer as the mail indicator on a graphic
148display. See `display-time-use-mail-icon' and 148display. See `display-time-use-mail-icon' and
149`display-time-mail-face'.") 149`display-time-mail-face'.")
150 150
151(defcustom display-time-use-mail-icon nil 151(defcustom display-time-use-mail-icon nil
152 "Non-nil means use an icon as the mail indictor on a grephic display. 152 "Non-nil means use an icon as the mail indicator on a graphic display.
153Otherwise use the string \"Mail\". The icon may consume less of the 153Otherwise use the string \"Mail\". The icon may consume less of the
154mode line. It is specified by `display-time-mail-icon'." 154mode line. It is specified by `display-time-mail-icon'."
155 :group 'display-time 155 :group 'display-time
@@ -240,7 +240,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
240 (time (current-time-string now)) 240 (time (current-time-string now))
241 (load (condition-case () 241 (load (condition-case ()
242 (if (zerop (car (load-average))) "" 242 (if (zerop (car (load-average))) ""
243 ;; The load average number is myterious, so 243 ;; The load average number is mysterious, so
244 ;; propvide some help. 244 ;; propvide some help.
245 (let ((str (format " %03d" (car (load-average))))) 245 (let ((str (format " %03d" (car (load-average)))))
246 (propertize 246 (propertize