tec
/
org-glossary
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix issue with already-included not propogating 

I have no idea why nconc works and push doesn't, but testing confirms
that push is inadequate for preventing duplication.
This commit is contained in:
TEC 2022-07-13 22:51:45 +08:00
parent 6b3ca56546
commit 8e9885f43a
Signed by: tec
GPG Key ID: 779591AFDB81F06C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org-glossary.el
View File

@ -309,8 +309,10 @@ Requires `org-glossary-fontify-types-differently' to be non-nil."
Terms from `org-glossary--extra-term-sources' will be added
unless PATH-SPEC is non-nil and NO-EXTRA-SOURCES nil."
(let* ((path-spec (org-glossary--complete-path-spec path-spec))
(term-source (org-glossary--get-terms-oneshot path-spec)))
(push path-spec already-included)
(term-source
(and (not (member path-spec already-included))
(org-glossary--get-terms-oneshot path-spec))))
(setq already-included (nconc already-included (list path-spec)))
(org-glossary--maybe-add-extra-terms
#'org-glossary--get-terms
(apply #'append
@ -495,7 +497,9 @@ the quicklookup cache (`org-glossary--quicklookup-cache') will be cleared."
(file-attribute-modification-time
(file-attributes cached-file))))))))
(term-source
(or (and term-source-cached
(or (and (member path-spec already-included)
'(:terms nil))
(and term-source-cached
(if cache-valid t
(delq term-source-cached org-glossary--terms-cache)
nil)
@ -508,7 +512,7 @@ the quicklookup cache (`org-glossary--quicklookup-cache') will be cleared."
(when (and (not (hash-table-empty-p org-glossary--quicklookup-cache))
term-source-cached (not cache-valid))
(setq org-glossary--quicklookup-cache (make-hash-table :test #'equal)))
(push path-spec already-included)
(setq already-included (nconc already-included (list path-spec)))
(org-glossary--maybe-add-extra-terms
#'org-glossary--get-terms-cached
(apply #'append