Mercurial > emacs
diff lisp/time.el @ 112098:40af77a50adc
Merge changes from emacs-23 branch
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 02 Jan 2011 15:28:40 -0500 |
parents | 4e901a2d3669 2285c33f3bb0 |
children | 417b1e4d63cd |
line wrap: on
line diff
--- a/lisp/time.el Sun Jan 02 11:23:02 2011 +0000 +++ b/lisp/time.el Sun Jan 02 15:28:40 2011 -0500 @@ -463,7 +463,9 @@ "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."