From f25ad39983cc3e89b007390bc0fd860f48379497 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 16 Dec 2021 09:40:22 -0800 Subject: [PATCH] Assume current-time-zone exists * lisp/timezone.el (timezone-time-zone-from-absolute): Simplify by assuming current-time-zone exists (true since Emacs 19.7 in 1993). --- lisp/timezone.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/timezone.el b/lisp/timezone.el index 0fcdbdbc16c..7a461c4e22d 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -299,11 +299,10 @@ Return a list in the same format as `current-time-zone's result, or nil if the local time zone could not be computed. DATE is the number of days elapsed since the (imaginary) Gregorian date Sunday, December 31, 1 BC." - (and (fboundp 'current-time-zone) - (let ((utc-time (timezone-time-from-absolute date seconds))) - (and utc-time - (let ((zone (current-time-zone utc-time))) - (and (car zone) zone)))))) + (let ((utc-time (timezone-time-from-absolute date seconds))) + (and utc-time + (let ((zone (current-time-zone utc-time))) + (and (car zone) zone))))) (defun timezone-fix-time (date local timezone) "Convert DATE (default timezone LOCAL) to YYYY-MM-DD-HH-MM-SS-ZONE vector. -- 2.39.5