(vip-shift-width): Doc fix.

[bpt/emacs.git] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index 14a6a17..371d815 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -62,8 +62,9 @@ If `display-time-day-and-date' is non-nil, the current day and date
 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
@@ -73,23 +74,28 @@ After each update, `display-time-hook' is run with `run-hooks'."
              (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
@@ -111,14 +117,15 @@ and `time-zone' all alphabetic strings, and `mail' a true/nil value.
 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)))))
@@ -150,7 +157,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
          (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))
@@ -163,11 +170,11 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
               ("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))