From f8f1c8c33a0a8fa117bf06e3b34865dea48eb6a1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 31 Jul 2019 19:21:50 -0700 Subject: format-time-string subsumes time-zone-format * lisp/calendar/time-date.el (time-zone-format): * test/lisp/calendar/time-date-tests.el (test-time-zone-format): Remove. * lisp/gnus/nnrss.el (nnrss-normalize-date): Use format-time-string instead of time-zone-format. --- lisp/calendar/time-date.el | 14 -------------- lisp/gnus/nnrss.el | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'lisp') diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index b94bf52760d..32ba1286895 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -352,20 +352,6 @@ is output until the first non-zero unit is encountered." (<= (car here) delay))) (concat (format "%.2f" (/ delay (car (cddr here)))) (cadr here)))))) -(defun time-zone-format (seconds &optional short) - "Format SECONDS as a valid time zone string. -For instance, 3600 is \"+01:00\". -If SHORT, the colon isn't included." - (format "%s%02d%s%02d" - (if (< seconds 0) - "-" - "+") - (/ (abs seconds) 3600) - (if short - "" - ":") - (mod (abs seconds) 3600))) - (defun date-days-in-month (year month) "The number of days in MONTH in YEAR." (if (= month 2) diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index f2c86ee44e8..82d3f574249 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -487,7 +487,7 @@ which RSS 2.0 allows." (format "%s, %02d %s %04d %s%s" (substring cts 0 3) day (substring cts 4 7) year time (if zone - (concat " " (time-zone-format zone t)) + (concat " " (format-time-string "%z" nil zone)) ""))) (message-make-date given)))) -- cgit v1.2.3