fix(org): update load, declare-function

In Emacs 31, org-element-property and org-element-type have moved to a new file: org-element-ast. Update code to handle this properly. Signed-off-by: Bruce D'Arcus <[email protected]>
emacs-citar · Oct 27, 2024 · 46bc177 · 46bc177
1 parent 02e25f3
commit 46bc177
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/citar-org.el b/citar-org.el
@@ -21,15 +21,20 @@
 
 (require 'citar)
 (require 'org)
-(require 'org-element)
+(if (not (require 'org-element-ast nil t))
+    ;; they moved the functions we need to this file
+    ;; if it's not present, fallback to the old one
+    (require 'org-element))
 (require 'org-id)
 (require 'oc)
 (require 'oc-basic)
 (require 'oc-csl)
 
 (declare-function org-open-at-point "org")
-(declare-function org-element-property "org-element")
-(declare-function org-element-type "org-element")
+;; we need to account for the move of these functions to a different file
+(declare-function org-element-property nil)
+(declare-function org-element-type nil)
+
 (declare-function org-cite-make-insert-processor "oc")
 (declare-function org-cite-get-references "oc")
 (declare-function embark-act "ext:embark")