summaryrefslogtreecommitdiff
path: root/lisp/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/calendar')
-rw-r--r--lisp/calendar/time-date.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index efc9ae4e3b9..6f851712472 100644
--- 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)