diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-01-04 00:30:43 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-01-04 00:30:43 -0500 |
| commit | e7fe57dde392d8f3973a3d0a6074f7e0a31585d9 (patch) | |
| tree | cae97e35dc6d587f3f8c859dfb663c5734c5953e | |
| parent | c3888a8b74ef82d321fcf8f695d9dcb901a409a1 (diff) | |
| parent | 273391c978d2e9759a9a389bf5d5eb9b03b8fe98 (diff) | |
| download | org-mode-e7fe57dde392d8f3973a3d0a6074f7e0a31585d9.tar.gz | |
Merge branch 'maint'
| -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) |