emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals-release/org 273391c: duration: Avoid recursive load err


From: ELPA Syncer
Subject: [elpa] externals-release/org 273391c: duration: Avoid recursive load error
Date: Mon, 4 Jan 2021 00:57:11 -0500 (EST)

branch: externals-release/org
commit 273391c978d2e9759a9a389bf5d5eb9b03b8fe98
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    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
---
 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]