diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-16 09:40:22 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-16 11:17:26 -0800 |
| commit | e0ca8f791c2e4396f1e40d86c136ae547b40185d (patch) | |
| tree | ad45c9ac4238ad159598a70506cfa0bf53b4bc56 | |
| parent | fc520f8b7090fb95e61a498b5b23be6041475bd3 (diff) | |
| download | emacs-e0ca8f791c2e4396f1e40d86c136ae547b40185d.tar.gz | |
Prefer format-time-string to current-time-zone
* lisp/org/ox-icalendar.el (org-icalendar-template)
(org-icalendar-export-current-agenda)
(org-icalendar--combine-files):
* lisp/time.el (display-time-update):
Prefer (format-time-string "%Z") to (cadr (current-time-zone)).
| -rw-r--r-- | lisp/org/ox-icalendar.el | 7 | ||||
| -rw-r--r-- | lisp/time.el | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index 16c3dc9a029..211d0f716b8 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el @@ -824,8 +824,7 @@ as a communication channel." (if (not (plist-get info :with-author)) "" (org-export-data (plist-get info :author) info)) ;; Timezone. - (if (org-string-nw-p org-icalendar-timezone) org-icalendar-timezone - (cadr (current-time-zone))) + (or (org-string-nw-p org-icalendar-timezone) (format-time-string "%Z")) ;; Description. (org-export-data (plist-get info :title) info) contents)) @@ -972,7 +971,7 @@ This function assumes major mode for current buffer is (org-icalendar--vcalendar org-icalendar-combined-name user-full-name - (or (org-string-nw-p org-icalendar-timezone) (cadr (current-time-zone))) + (or (org-string-nw-p org-icalendar-timezone) (format-time-string "%Z")) org-icalendar-combined-description contents))) (run-hook-with-args 'org-icalendar-after-save-hook file))) @@ -995,7 +994,7 @@ FILES is a list of files to build the calendar from." user-full-name ;; Timezone. (or (org-string-nw-p org-icalendar-timezone) - (cadr (current-time-zone))) + (format-time-string "Z")) ;; Description. org-icalendar-combined-description ;; Contents. diff --git a/lisp/time.el b/lisp/time.el index fcea064b4cf..b67315cf630 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -355,7 +355,7 @@ update which can wait for the next redisplay." (am-pm (if (>= hour 12) "pm" "am")) (minutes (substring time 14 16)) (seconds (substring time 17 19)) - (time-zone (car (cdr (current-time-zone now)))) + (time-zone (format-time-string "%Z" now)) (day (substring time 8 10)) (year (format-time-string "%Y" now)) (monthname (substring time 4 7)) |