diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-05-04 16:33:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-05-04 16:33:19 +0000 |
| commit | 121211d44055e1f0cd50c21ec0bae2e7085643a2 (patch) | |
| tree | 446e23630224757f1c2639eab57b4b7a52ec023d /lisp/time.el | |
| parent | ebad70ded3e8510c434326977a566c16aa57873f (diff) | |
| download | emacs-121211d44055e1f0cd50c21ec0bae2e7085643a2.tar.gz | |
(display-time-string-forms): Test display-time-day-and-date
and display-time-24hr-format here.
(display-time-format): Default value is now nil.
Diffstat (limited to 'lisp/time.el')
| -rw-r--r-- | lisp/time.el | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/time.el b/lisp/time.el index 8f798fa08a2..0da580afd86 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -100,17 +100,19 @@ This runs the normal hook `display-time-hook' after each update." 'display-time-event-handler)))) -(defvar display-time-format - (concat - (if display-time-day-and-date - "%a %b %e" "") - (if display-time-24hr-format "%H:%m" "%-I:%M%p")) +(defvar display-time-format nil "*A string specifying the format for displaying the time in the mode line. See the function `format-time-string' for an explanation of -how to write this string.") +how to write this string. If this is nil, the defaults +depend on `display-time-day-and-date' and `display-time-24hr-format'.") (defvar display-time-string-forms - '((format-time-string display-time-format now) + '((if (and (not display-time-format) display-time-day-and-date) + (format-time-string "%a %b %e " now) + "") + (format-time-string (or display-time-format + (if display-time-24hr-format "%H:%m" "%-I:%M%p")) + now) load (if mail " Mail" "")) "*A list of expressions governing display of the time in the mode line. |