1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00

Adapt calls to 'format-time-string' to changes in Emacs 25

* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): Use t as the
last argument to format-time-string.  (Bug#23128)
* lisp/gnus/gmm-utils.el (gmm-format-time-string): Use t as the
last argument to format-time-string, when the TZ argument is not a
number, per the doc string.
This commit is contained in:
Eli Zaretskii 2016-04-02 14:25:47 +03:00
parent 17b5152d73
commit 0020047fda
2 changed files with 2 additions and 2 deletions

View File

@ -473,7 +473,7 @@ specifiers `%Z' and `%z' will be replaced with a numeric form. "
(setq st nd))
(push (substring format-string st) rest)
(format-time-string (apply 'concat (nreverse rest)) time))
(format-time-string format-string time tz)))
(format-time-string format-string time t)))
(provide 'gmm-utils)

View File

@ -465,7 +465,7 @@ DIR can also be a file."
((equal date "Result of merge") (setq subtype 'MERGED))
((let ((mtime (nth 5 (file-attributes (concat dir f))))
(system-time-locale "C"))
(setq timestamp (format-time-string "%c" mtime 'utc))
(setq timestamp (format-time-string "%c" mtime t))
;; Solaris sometimes uses "Wed Sep 05", not "Wed Sep 5".
;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference.
(if (= (aref timestamp 8) ?0)