diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-04-02 14:25:47 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-04-02 14:25:47 +0300 |
| commit | 0020047fdaf6b180009e2f5bb24975fc8ed75136 (patch) | |
| tree | 5cb9207a34d44c8880f414ebfb2e4ab8793c1a33 /lisp | |
| parent | 17b5152d737e74a3b99a98f3be9866facee8865f (diff) | |
| download | emacs-0020047fdaf6b180009e2f5bb24975fc8ed75136.tar.gz emacs-0020047fdaf6b180009e2f5bb24975fc8ed75136.tar.bz2 emacs-0020047fdaf6b180009e2f5bb24975fc8ed75136.zip | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/gmm-utils.el | 2 | ||||
| -rw-r--r-- | 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 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) |