(defvar display-time-mail-file nil
"*File name of mail inbox file, for indicating existence of new mail.
-Default is system-dependent, and is the same as used by Rmail.")
+Non-nil and not a string means don't check for mail. nil means use
+default, which is system-dependent, and is the same as used by Rmail.")
;;;###autoload
(defvar display-time-day-and-date nil "\
are displayed as well.
After each update, `display-time-hook' is run with `run-hooks'."
(interactive)
- (let ((live (and display-time-process
- (eq (process-status display-time-process) 'run))))
+ (let ((live (or (and (eq system-type 'ms-dos) dos-display-time)
+ (and display-time-process
+ (eq (process-status display-time-process) 'run)))))
(if (not live)
(progn
(if display-time-process
(setq global-mode-string
(append global-mode-string '(display-time-string))))
(setq display-time-string "")
- ;; Using a pty is wasteful, and the separate session causes
- ;; annoyance sometimes (some systems kill idle sessions).
- (let ((process-connection-type nil))
- (setq display-time-process
- (start-process "display-time" nil
- (expand-file-name "wakeup" exec-directory)
- (int-to-string display-time-interval))))
- (process-kill-without-query display-time-process)
- (set-process-sentinel display-time-process 'display-time-sentinel)
- (set-process-filter display-time-process 'display-time-filter)))))
+ (if (eq system-type 'ms-dos)
+ (setq dos-display-time t)
+ ;; Using a pty is wasteful, and the separate session causes
+ ;; annoyance sometimes (some systems kill idle sessions).
+ (progn
+ (let ((process-connection-type nil))
+ (setq display-time-process
+ (start-process "display-time" nil
+ (expand-file-name
+ "wakeup" exec-directory)
+ (int-to-string display-time-interval))))
+ (process-kill-without-query display-time-process)
+ (set-process-sentinel display-time-process
+ 'display-time-sentinel)
+ (set-process-filter display-time-process
+ 'display-time-filter)))))))
(defun display-time-sentinel (proc reason)
(or (eq (process-status proc) 'run)
(setq display-time-string ""))
;; Force mode-line updates
- (save-excursion (set-buffer (other-buffer)))
- (set-buffer-modified-p (buffer-modified-p))
+ (force-mode-line-update t)
(sit-for 0))
(defvar display-time-string-forms
For example, the form
'((substring year -2) \"/\" month \"/\" day
- " " 24-hours \":\" minutes \":\" seconds
+ \" \" 24-hours \":\" minutes \":\" seconds
(if time-zone \" (\") time-zone (if time-zone \")\")
(if mail \" Mail\" \"\"))
would give mode line times like `94/12/30 21:07:48 (UTC)'.")
(defun display-time-filter (proc string)
- (let* ((time (current-time-string))
+ (let* ((now (current-time))
+ (time (current-time-string now))
(load (condition-case ()
(if (zerop (car (load-average))) ""
(let ((str (format " %03d" (car (load-average)))))
(getenv "MAIL")
(concat rmail-spool-directory
(user-login-name))))
- (mail (and (or (null display-time-server-down-time)
+ (mail (and (stringp mail-spool-file)
+ (or (null display-time-server-down-time)
;; If have been down for 20 min, try again.
(> (- (nth 1 (current-time))
display-time-server-down-time)
(am-pm (if (>= hour 12) "pm" "am"))
(minutes (substring time 14 16))
(seconds (substring time 17 19))
- (time-zone (car (cdr (current-time-zone))))
+ (time-zone (car (cdr (current-time-zone now))))
(day (substring time 8 10))
(year (substring time 20 24))
(monthname (substring time 4 7))
("Sep" . "9") ("Oct" . "10") ("Nov" . "11") ("Dec" . "12")))))
(dayname (substring time 0 3)))
(setq display-time-string
- (mapconcat 'eval display-time-string-forms "")))
- (run-hooks 'display-time-hook)
- ;; Force redisplay of all buffers' mode lines to be considered.
- (save-excursion (set-buffer (other-buffer)))
- (set-buffer-modified-p (buffer-modified-p))
+ (mapconcat 'eval display-time-string-forms ""))
+ ;; This is inside the let binding, but we are not going to document
+ ;; what variables are available.
+ (run-hooks 'display-time-hook))
+ (force-mode-line-update)
;; Do redisplay right now, if no input pending.
(sit-for 0))