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, depending on version. Signed-off-by: Bruce D'Arcus <[email protected]>
emacs-citar · Oct 26, 2024 · abdd5c0 · abdd5c0
1 parent 0f1786b
commit abdd5c0
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 (require 'org-element-ast nil 'noerror)
+  (require 'org-element)
+  (message "Loaded 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")
+(if (locate-library "org-element-ast")
+    (declare-function org-element-property "org-element-ast")
+    (declare-function org-element-type "org-element-ast")
+  (declare-function org-element-type "org-element")
+  (declare-function org-element-property "org-element"))
 (declare-function org-cite-make-insert-processor "oc")
 (declare-function org-cite-get-references "oc")
 (declare-function embark-act "ext:embark")