Skip to content

Commit 720d1d5

Browse files
committed
Adapt various functions so they don't consider :aliases a valid timezone id.
1 parent 8cfa779 commit 720d1d5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

datetime.el

+5-5
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ be modified freely."
207207
208208
Return value is a list of symbols in no particular order; it can
209209
be modified freely."
210-
(extmap-keys datetime--timezone-extmap))
210+
(delq :aliases (extmap-keys datetime--timezone-extmap)))
211211

212212

213213
(defgroup datetime nil
@@ -265,7 +265,7 @@ form:
265265
(let ((timezone (plist-get options :timezone)))
266266
(if (eq timezone 'system)
267267
(or (when datetime-timezone
268-
(if (extmap-contains-key datetime--timezone-extmap datetime-timezone)
268+
(if (and (not (eq datetime-timezone :aliases)) (extmap-contains-key datetime--timezone-extmap datetime-timezone))
269269
datetime-timezone
270270
(warn "Timezone `%S' (value of `datetime-timezone' variable) is not known" datetime-timezone)
271271
nil))
@@ -303,7 +303,7 @@ form:
303303
)
304304
(cadr (current-time-zone))
305305
"?"))))
306-
(if (extmap-contains-key datetime--timezone-extmap system-timezone)
306+
(if (and (not (eq system-timezone :aliases)) (extmap-contains-key datetime--timezone-extmap system-timezone))
307307
system-timezone
308308
(let* ((aliases (extmap-get datetime--timezone-extmap :aliases t))
309309
(entry (assq system-timezone aliases)))
@@ -702,7 +702,7 @@ to this function.
702702
form of a Lisp lambda."
703703
(let* ((locale (datetime--get-locale options))
704704
(timezone (datetime--get-timezone options))
705-
(timezone-data (or (extmap-get datetime--timezone-extmap timezone t)
705+
(timezone-data (or (unless (eq timezone :aliases) (extmap-get datetime--timezone-extmap timezone t))
706706
(error "Unknown timezone `%s'" timezone)))
707707
need-year need-month need-weekday need-day need-hour need-time
708708
format-parts
@@ -1126,7 +1126,7 @@ unless specified otherwise.
11261126
of Lisp lambda."
11271127
(let* ((locale (datetime--get-locale options))
11281128
(timezone (datetime--get-timezone options))
1129-
(timezone-data (or (extmap-get datetime--timezone-extmap timezone t)
1129+
(timezone-data (or (unless (eq timezone :aliases) (extmap-get datetime--timezone-extmap timezone t))
11301130
(error "Unknown timezone `%s'" timezone)))
11311131
(defaults (plist-get options :defaults))
11321132
(validating (not (plist-get options :non-validating)))

0 commit comments

Comments
 (0)