diff options
| author | TEC <tec@tecosaur.com> | 2021-07-13 02:00:38 +0800 |
|---|---|---|
| committer | TEC <tec@tecosaur.com> | 2021-07-15 03:36:24 +0800 |
| commit | 604bfd9d755770e12c368c15148780ec723211df (patch) | |
| tree | 51e5941042f45292c82d271c396d675bba3c45cd | |
| parent | fc273bfce1ba35d003608aa38d1ca366426fee58 (diff) | |
| download | org-mode-604bfd9d755770e12c368c15148780ec723211df.tar.gz | |
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.
| -rw-r--r-- | lisp/oc-csl.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el index a7a2a60..5e0e272 100644 --- a/lisp/oc-csl.el +++ b/lisp/oc-csl.el @@ -177,9 +177,14 @@ Used only when `second-field-align' is activated by the used CSL style." ;;; 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 |