-When this display is enabled, it updates automatically every minute.
-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."
- (interactive "P")
- (let ((on (if (null arg)
- (not display-time-timer)
- (> (prefix-numeric-value arg) 0))))
- (and display-time-timer (cancel-timer display-time-timer))
- (setq display-time-timer nil)
- (setq display-time-string "")
- (or global-mode-string (setq global-mode-string '("")))
- (if on
- (progn
- (or (memq 'display-time-string global-mode-string)
- (setq global-mode-string
- (append global-mode-string '(display-time-string))))
- ;; Set up the time timer.
- (setq display-time-timer
- (run-at-time t display-time-interval
- 'display-time-event-handler))
- ;; Make the time appear right away.
- (display-time-update)
- ;; When you get new mail, clear "Mail" from the mode line.
- (add-hook 'rmail-after-get-new-mail-hook
- 'display-time-event-handler))
- (remove-hook 'rmail-after-get-new-mail-hook
- 'display-time-event-handler))))
-
-
-(defvar display-time-string-forms
- '((if display-time-day-and-date
- (format "%s %s %s " dayname monthname day)
+(defcustom display-time-mail-face nil
+ "Face to use for `display-time-mail-string'.
+If `display-time-use-mail-icon' is non-nil, the image's
+background color is the background of this face. Set this to
+make the mail indicator stand out on a color display."
+ :group 'mode-line-faces
+ :group 'display-time
+ :version "22.1"
+ :type '(choice (const :tag "None" nil) face))
+
+(defvar display-time-mail-icon
+ (find-image '((:type xpm :file "letter.xpm" :ascent center)
+ (:type pbm :file "letter.pbm" :ascent center)))
+ "Image specification to offer as the mail indicator on a graphic display.
+See `display-time-use-mail-icon' and `display-time-mail-face'.")
+
+;; Fixme: Default to icon on graphical display?
+(defcustom display-time-use-mail-icon nil
+ "Non-nil means use an icon as mail indicator on a graphic display.
+Otherwise use `display-time-mail-string'. The icon may consume less
+of the mode line. It is specified by `display-time-mail-icon'."
+ :group 'display-time
+ :type 'boolean)
+
+;; Fixme: maybe default to the character if we can display Unicode.
+(defcustom display-time-mail-string "Mail"
+ "String to use as the mail indicator in `display-time-string-forms'.
+This can use the Unicode letter character if you can display it."
+ :group 'display-time
+ :version "22.1"
+ :type '(choice (const "Mail")
+ ;; Use :tag here because the Lucid menu won't display
+ ;; multibyte text.
+ (const :tag "Unicode letter character" "✉")
+ string))
+
+(defcustom display-time-format nil
+ "*String specifying format for displaying the time in the mode line.
+See the function `format-time-string' for an explanation of
+how to write this string. If this is nil, the defaults
+depend on `display-time-day-and-date' and `display-time-24hr-format'."
+ :type '(choice (const :tag "Default" nil)
+ string)
+ :group 'display-time)
+
+(defcustom display-time-string-forms
+ '((if (and (not display-time-format) display-time-day-and-date)
+ (format-time-string "%a %b %e " now)