Mercurial > emacs
comparison lisp/time.el @ 109553:a4b9fa0b861b
Merge from emacs-23
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 27 Jul 2010 04:10:05 +0200 |
| parents | 1d31012de150 e510f7e2723a |
| children | 4e901a2d3669 |
comparison
equal
deleted
inserted
replaced
| 109552:9eac3b0c2884 | 109553:a4b9fa0b861b |
|---|---|
| 85 :type 'number | 85 :type 'number |
| 86 :group 'display-time) | 86 :group 'display-time) |
| 87 | 87 |
| 88 ;;;###autoload | 88 ;;;###autoload |
| 89 (defcustom display-time-day-and-date nil "\ | 89 (defcustom display-time-day-and-date nil "\ |
| 90 *Non-nil means \\[display-time] should display day and date as well as time." | 90 Non-nil means \\[display-time] should display day and date as well as time." |
| 91 :type 'boolean | 91 :type 'boolean |
| 92 :group 'display-time) | 92 :group 'display-time) |
| 93 | 93 |
| 94 (defvar display-time-timer nil) | 94 (defvar display-time-timer nil) |
| 95 | 95 |
| 180 :group 'display-time | 180 :group 'display-time |
| 181 :type 'string | 181 :type 'string |
| 182 :version "23.1") | 182 :version "23.1") |
| 183 | 183 |
| 184 (defcustom display-time-world-buffer-name "*wclock*" | 184 (defcustom display-time-world-buffer-name "*wclock*" |
| 185 "Name of the wclock buffer." | 185 "Name of the world clock buffer." |
| 186 :group 'display-time | 186 :group 'display-time |
| 187 :type 'string | 187 :type 'string |
| 188 :version "23.1") | 188 :version "23.1") |
| 189 | 189 |
| 190 (defcustom display-time-world-timer-enable t | 190 (defcustom display-time-world-timer-enable t |
| 201 | 201 |
| 202 (defvar display-time-world-mode-map | 202 (defvar display-time-world-mode-map |
| 203 (let ((map (make-sparse-keymap))) | 203 (let ((map (make-sparse-keymap))) |
| 204 (define-key map "q" 'kill-this-buffer) | 204 (define-key map "q" 'kill-this-buffer) |
| 205 map) | 205 map) |
| 206 "Keymap of Display Time World mode") | 206 "Keymap of Display Time World mode.") |
| 207 | 207 |
| 208 ;;;###autoload | 208 ;;;###autoload |
| 209 (defun display-time () | 209 (defun display-time () |
| 210 "Enable display of time, load level, and mail flag in mode lines. | 210 "Enable display of time, load level, and mail flag in mode lines. |
| 211 This display updates automatically every minute. | 211 This display updates automatically every minute. |