Mercurial > emacs
changeset 17644:d73425ee186b
(display-time-string-forms): Test display-time-day-and-date
and display-time-24hr-format here.
(display-time-format): Default value is now nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 04 May 1997 16:33:19 +0000 |
| parents | fd27882450bd |
| children | b85205cfba13 |
| files | lisp/time.el |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/time.el Sun May 04 16:02:44 1997 +0000 +++ b/lisp/time.el Sun May 04 16:33:19 1997 +0000 @@ -100,17 +100,19 @@ '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.