aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1995-06-07 18:35:06 +0000
committerKarl Heuer1995-06-07 18:35:06 +0000
commite974f5992b38242b7e31c7fdcfce6c12dd976c64 (patch)
treea83bd4a324b5ddf936fed8823d8012c4d5004fd2
parent83abd5437d3e3f832b777b597869f3cc25a3c215 (diff)
downloademacs-e974f5992b38242b7e31c7fdcfce6c12dd976c64.tar.gz
emacs-e974f5992b38242b7e31c7fdcfce6c12dd976c64.zip
(display-time-filter):
Use same instant for both time and time-zone.
-rw-r--r--lisp/time.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/time.el b/lisp/time.el
index f99cb3c5d51..e841d52618d 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -117,7 +117,8 @@ For example, the form
117would give mode line times like `94/12/30 21:07:48 (UTC)'.") 117would give mode line times like `94/12/30 21:07:48 (UTC)'.")
118 118
119(defun display-time-filter (proc string) 119(defun display-time-filter (proc string)
120 (let* ((time (current-time-string)) 120 (let* ((now (current-time))
121 (time (current-time-string now))
121 (load (condition-case () 122 (load (condition-case ()
122 (if (zerop (car (load-average))) "" 123 (if (zerop (car (load-average))) ""
123 (let ((str (format " %03d" (car (load-average))))) 124 (let ((str (format " %03d" (car (load-average)))))
@@ -149,7 +150,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
149 (am-pm (if (>= hour 12) "pm" "am")) 150 (am-pm (if (>= hour 12) "pm" "am"))
150 (minutes (substring time 14 16)) 151 (minutes (substring time 14 16))
151 (seconds (substring time 17 19)) 152 (seconds (substring time 17 19))
152 (time-zone (car (cdr (current-time-zone)))) 153 (time-zone (car (cdr (current-time-zone now))))
153 (day (substring time 8 10)) 154 (day (substring time 8 10))
154 (year (substring time 20 24)) 155 (year (substring time 20 24))
155 (monthname (substring time 4 7)) 156 (monthname (substring time 4 7))