From 0020047fdaf6b180009e2f5bb24975fc8ed75136 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Apr 2016 14:25:47 +0300
Subject: 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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/gnus/gmm-utils.el')

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)
 
-- 
cgit v1.2.3