Hello, It's come to my attention that the current value of org-cite-ctl--etc-dir is problematic for anyone managing Org with package.el or straight. This patch adds a check to see if the initial location actually exists, if it doesn't we try the expected location when using package.el/straight.
-- Timothy
>From 5e6700177f4ef59131c153d985b8eaeb3b303799 Mon Sep 17 00:00:00 2001 From: TEC <t...@tecosaur.com> Date: Tue, 13 Jul 2021 02:00:38 +0800 Subject: [PATCH] oc-csl: be more caution about the csl etc location * lisp/oc-csl.el (org-cite-ctl--etc-dir): The previous value of `org-cite-ctl--etc-dir' is incorrect when using either package.el or straight to manage Org. We can be a bit more considerate by just checking if the initial location exists, and then trying the expected location when using package.el/straight if it doesn't exist. --- lisp/oc-csl.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el index a7a2a6042..5e0e27211 100644 --- a/lisp/oc-csl.el +++ b/lisp/oc-csl.el @@ -177,9 +177,14 @@ (defcustom org-cite-csl-latex-hanging-indent "1.5em" ;;; Internal variables (defconst org-cite-csl--etc-dir - (expand-file-name - (concat (file-name-directory (locate-library "oc")) - "../etc/csl/")) + (let* ((oc-root (file-name-directory (locate-library "oc"))) + (oc-etc-dir-1 (expand-file-name "../etc/csl/" oc-root))) + ;; package.el and straight will put all of org-mode/lisp/ in org-mode/. + ;; This will cause .. to resolve to the directory above Org. + ;; To make life easier for people using package.el or straight, we can + ;; check to see if ../etc/csl exists, and if it doesn't try ./etc/csl. + (if (file-exists-p oc-etc-dir-1) oc-etc-dir-1 + (expand-file-name "etc/csl/" oc-root))) "Directory \"etc/\" from repository.") (defconst org-cite-csl--fallback-locales-dir org-cite-csl--etc-dir -- 2.32.0
