summaryrefslogtreecommitdiff
path: root/lisp/time.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-02 15:31:19 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-02 15:31:19 -0500
commit7c420169baa7c50428589cca7f8eda71b462eb15 (patch)
treeb556f9e181818bbaf8b5b425844b4ae26e88f537 /lisp/time.el
parentbb7f5cbcda931661c8dc3311603ac764fa87a639 (diff)
parentd12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff)
downloademacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/time.el')
-rw-r--r--lisp/time.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/time.el b/lisp/time.el
index 006fd758a7c..3fc17ec6eee 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -463,7 +463,9 @@ update which can wait for the next redisplay."
"Toggle display of time, load level, and mail flag in mode lines.
With a numeric arg, enable this display if arg is positive.
-When this display is enabled, it updates automatically every minute.
+When this display is enabled, it updates automatically every minute
+\(you can control the number of seconds between updates by
+customizing `display-time-interval').
If `display-time-day-and-date' is non-nil, the current day and date
are displayed as well.
This runs the normal hook `display-time-hook' after each update."