Merge branch 'maint'

2021-01-04 00:30:43 -05:00 · 2021-01-04 00:30:43 -05:00 · e7fe57dde3
parent c3888a8b74 273391c978
commit e7fe57dde3
1 changed files with 5 additions and 1 deletions
--- 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)