aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-07-31 15:15:47 +0200
committerLars Ingebrigtsen2019-07-31 21:47:29 +0200
commitfa648a59c9818ae284209ac7ae4f3700aebd92c9 (patch)
tree1fbb93253b803146e0fa13dddf3af00fb0c7db40
parent4dcb692de0cf0107149abe501663a1477571bfc0 (diff)
downloademacs-fa648a59c9818ae284209ac7ae4f3700aebd92c9.tar.gz
emacs-fa648a59c9818ae284209ac7ae4f3700aebd92c9.zip
Allow timezone defaults in decoded-time-set-defaults
* lisp/calendar/time-date.el (decoded-time-set-defaults): Allow passing in a default time zone, as this seems to be something callers seem to do.
-rw-r--r--lisp/calendar/time-date.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index dfe8dce68b1..b94bf52760d 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -512,7 +512,7 @@ changes in daylight saving time are not taken into account."
512 "Return a `decoded-time' structure with only the keywords given filled out." 512 "Return a `decoded-time' structure with only the keywords given filled out."
513 (list second minute hour day month year nil dst zone)) 513 (list second minute hour day month year nil dst zone))
514 514
515(defun decoded-time-set-defaults (time) 515(defun decoded-time-set-defaults (time &optional default-zone)
516 "Set any nil values in `decoded-time' TIME to default values. 516 "Set any nil values in `decoded-time' TIME to default values.
517The default value is based on January 1st, 1970 at midnight. 517The default value is based on January 1st, 1970 at midnight.
518 518
@@ -536,6 +536,10 @@ TIME is modified and returned."
536 (when (and (not (decoded-time-zone time)) 536 (when (and (not (decoded-time-zone time))
537 (not (decoded-time-dst time))) 537 (not (decoded-time-dst time)))
538 (setf (decoded-time-dst time) -1)) 538 (setf (decoded-time-dst time) -1))
539
540 (when (and (not (decoded-time-zone time))
541 default-zone)
542 (setf (decoded-time-zone time) 0))
539 time) 543 time)
540 544
541(provide 'time-date) 545(provide 'time-date)