Make time-zone-format take a SHORT parameter

* lisp/calendar/time-date.el (time-zone-format): Accept an
optional SHORT parameter.

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index efc9ae4e3b9fb81f7c8d572e8b8bd5b9953f6766..6f85171247228b562c094c49e9e3cec3556213ca 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -352,14 +352,18 @@ 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)
+(defun time-zone-format (seconds &optional short)
   "Format SECONDS as a valid time zone string.
-For instance, 3600 is \"+01:00\"."
-  (format "%s%02d:%02d"
+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)