Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 112045:52100bac91db | 112098:40af77a50adc |
|---|---|
| 461 ;;;###autoload | 461 ;;;###autoload |
| 462 (define-minor-mode display-time-mode | 462 (define-minor-mode display-time-mode |
| 463 "Toggle display of time, load level, and mail flag in mode lines. | 463 "Toggle display of time, load level, and mail flag in mode lines. |
| 464 With a numeric arg, enable this display if arg is positive. | 464 With a numeric arg, enable this display if arg is positive. |
| 465 | 465 |
| 466 When this display is enabled, it updates automatically every minute. | 466 When this display is enabled, it updates automatically every minute |
| 467 \(you can control the number of seconds between updates by | |
| 468 customizing `display-time-interval'). | |
| 467 If `display-time-day-and-date' is non-nil, the current day and date | 469 If `display-time-day-and-date' is non-nil, the current day and date |
| 468 are displayed as well. | 470 are displayed as well. |
| 469 This runs the normal hook `display-time-hook' after each update." | 471 This runs the normal hook `display-time-hook' after each update." |
| 470 :global t :group 'display-time | 472 :global t :group 'display-time |
| 471 (and display-time-timer (cancel-timer display-time-timer)) | 473 (and display-time-timer (cancel-timer display-time-timer)) |