diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-01-04 00:30:00 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-01-04 00:30:00 -0500 |
| commit | 273391c978d2e9759a9a389bf5d5eb9b03b8fe98 (patch) | |
| tree | 20c9fac557f7af1db5dc835999a745d0c082d445 | |
| parent | 99eafe3787e03ac31ab12b3cc28f7832ef8b0987 (diff) | |
| download | org-mode-273391c978d2e9759a9a389bf5d5eb9b03b8fe98.tar.gz | |
duration: Avoid recursive load error
* lisp/org-duration.el (org-duration-units): Guard against recursive
load error when org-duration-units is set via the Customize interface
before org-duration is loaded.
This follows the same approach used by erc-nickserv-identify-mode in
the Emacs repository.
Reported-by: Mario Bourgoin <m.bourgoin@gmail.com>
Ref: https://orgmode.org/list/CAM0Tqh+u+L+UgZizJrH+a+W7Lo1stPJgTsRABxD3HobOnOCrNA@mail.gmail.com
| -rw-r--r-- | lisp/org-duration.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/org-duration.el b/lisp/org-duration.el index 29fae2d..e627d09 100644 --- a/lisp/org-duration.el +++ b/lisp/org-duration.el @@ -97,7 +97,11 @@ sure to call the following command: :group 'org-agenda :version "26.1" :package-version '(Org . "9.1") - :set (lambda (var val) (set-default var val) (org-duration-set-regexps)) + :set (lambda (var val) + (set-default var val) + ;; Avoid recursive load at startup. + (when (featurep 'org-duration) + (org-duration-set-regexps))) :initialize 'custom-initialize-changed :type '(choice (const :tag "H:MM" h:mm) |