[Emacs-diffs] emacs-25 0020047: Adapt calls to 'format-time-string' to changes in Emacs 25

[Eli Zaretskii]

branch: emacs-25
commit 0020047fdaf6b180009e2f5bb24975fc8ed75136
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 lisp/gnus/gmm-utils.el |    2 +-
 lisp/vc/pcvs-info.el   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 6049f48..fca2394 100644
--- 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 1abc772..b9ecc89 100644
--- 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)