aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-03-21 18:53:14 +0000
committerGlenn Morris2009-03-21 18:53:14 +0000
commit3deeb46b95e30bdec46ab75a5500261c90b48123 (patch)
tree962c2267a325b15c50e8cbe731ed410f7522c342
parent520558d2587b16a411e1095bd56d34c3425e13f3 (diff)
downloademacs-3deeb46b95e30bdec46ab75a5500261c90b48123.tar.gz
emacs-3deeb46b95e30bdec46ab75a5500261c90b48123.zip
Jari Aalto <jari.aalto at cante.net>
(display-time-default-load-average): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/time.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8771a5a450..77cc3a4b8bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-03-21 Jari Aalto <jari.aalto@cante.net>
2
3 * time.el (display-time-default-load-average): Doc fix.
4
12009-03-21 Eli Zaretskii <eliz@gnu.org> 52009-03-21 Eli Zaretskii <eliz@gnu.org>
2 6
3 * simple.el (handle-shift-selection): Doc fix. (Bug#2738) 7 * simple.el (handle-shift-selection): Doc fix. (Bug#2738)
diff --git a/lisp/time.el b/lisp/time.el
index 965024bf7c2..874b606e3c2 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -65,7 +65,12 @@ directory `display-time-mail-directory' contains nonempty files."
65(defcustom display-time-default-load-average 0 65(defcustom display-time-default-load-average 0
66 "Which load average value will be shown in the mode line. 66 "Which load average value will be shown in the mode line.
67Almost every system can provide values of load for past 1 minute, past 5 or 67Almost every system can provide values of load for past 1 minute, past 5 or
68past 15 minutes. The default is to display 1 minute load average." 68past 15 minutes. The default is to display 1 minute load average.
69The value can be one of:
70
71 0 => 1 minute load
72 1 => 5 minutes load
73 2 => 15 minutes load"
69 :type '(choice (const :tag "1 minute load" 0) 74 :type '(choice (const :tag "1 minute load" 0)
70 (const :tag "5 minutes load" 1) 75 (const :tag "5 minutes load" 1)
71 (const :tag "15 minutes load" 2) 76 (const :tag "15 minutes load" 2)