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.

diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 6049f480461e81657fe307cfca60503d242a4576..fca2394cbc740ac5d2b3909376f89ab364999843 100644 (file)
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -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)
 

diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 1abc7729045142da5d6e90d678af31f505a55a31..b9ecc89254044ec0aa9476ae972cb604556daae7 100644 (file)
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -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)