aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-01-05 23:45:55 -0800
committerGlenn Morris2012-01-05 23:45:55 -0800
commit2bb4227ed1b68851a2e465ba864eb4c36c8fce9f (patch)
tree46a7cb1716911c5ae839dce8f359c9189acb50f0
parent7d5944b986d829dad02097f27120b1c4853263bf (diff)
downloademacs-2bb4227ed1b68851a2e465ba864eb4c36c8fce9f.tar.gz
emacs-2bb4227ed1b68851a2e465ba864eb4c36c8fce9f.zip
time.el minor doc fixes.
* lisp/time.el (display-time-load-average, display-time-next-load-average): Doc fixes.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/time.el5
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f333945de3..8ec5f49e634 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-01-06 Glenn Morris <rgm@gnu.org> 12012-01-06 Glenn Morris <rgm@gnu.org>
2 2
3 * time.el (display-time-load-average, display-time-next-load-average):
4 Doc fixes.
5
3 * emacs-lisp/bytecomp.el (byte-compile-file): Do not propagate a file 6 * emacs-lisp/bytecomp.el (byte-compile-file): Do not propagate a file
4 local setting of buffer-read-only to the input buffer. (Bug#10419) 7 local setting of buffer-read-only to the input buffer. (Bug#10419)
5 8
diff --git a/lisp/time.el b/lisp/time.el
index f7d1490a6c4..f611aa17543 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -78,7 +78,8 @@ The value can be one of:
78 :group 'display-time) 78 :group 'display-time)
79 79
80(defvar display-time-load-average nil 80(defvar display-time-load-average nil
81 "Load average currently being shown in mode line.") 81 "Load average currently being shown in mode line.
82See `display-time-default-load-average'.")
82 83
83(defcustom display-time-load-average-threshold 0.1 84(defcustom display-time-load-average-threshold 0.1
84 "Load-average values below this value won't be shown in the mode line." 85 "Load-average values below this value won't be shown in the mode line."
@@ -349,6 +350,8 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
349 (timer-activate timer))))) 350 (timer-activate timer)))))
350 351
351(defun display-time-next-load-average () 352(defun display-time-next-load-average ()
353 "Switch between different load averages in the mode line.
354Switches from the 1 to 5 to 15 minute load average, and then back to 1."
352 (interactive) 355 (interactive)
353 (if (= 3 (setq display-time-load-average (1+ display-time-load-average))) 356 (if (= 3 (setq display-time-load-average (1+ display-time-load-average)))
354 (setq display-time-load-average 0)) 357 (setq display-time-load-average 0))