Skip to content

Commit 7d07417

Browse files
committed
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]>
1 parent 0f1786b commit 7d07417

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

citar-org.el

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@
2121

2222
(require 'citar)
2323
(require 'org)
24-
(require 'org-element)
24+
(if (require 'org-element-ast nil 'noerror)
25+
(require 'org-element)
26+
(message "Loaded org-element"))
2527
(require 'org-id)
2628
(require 'oc)
2729
(require 'oc-basic)
2830
(require 'oc-csl)
2931

3032
(declare-function org-open-at-point "org")
31-
(declare-function org-element-property "org-element")
32-
(declare-function org-element-type "org-element")
33+
(if (locate-library "org-element-ast")
34+
(declare-function org-element-property "ext:org-element-ast")
35+
(declare-function org-element-type "ext:org-element-ast")
36+
(declare-function org-element-type "org-element")
37+
(declare-function org-element-property "org-element"))
3338
(declare-function org-cite-make-insert-processor "oc")
3439
(declare-function org-cite-get-references "oc")
3540
(declare-function embark-act "ext:embark")

0 commit comments

Comments
 (0)