From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Apr 2016 11:25:47 +0000 (+0300)
Subject: Adapt calls to 'format-time-string' to changes in Emacs 25
X-Git-Tag: emacs-25.0.93~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0020047fdaf6b180009e2f5bb24975fc8ed75136;p=emacs.git

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 6049f480461..fca2394cbc7 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 1abc7729045..b9ecc892540 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)