[elpa] externals/org e7fe57d: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit e7fe57dde392d8f3973a3d0a6074f7e0a31585d9
Merge: c3888a8 273391c
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'maint'
---
 lisp/org-duration.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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)