awesome-emacs/org-roam
1
0
Fork 0
mirror of https://github.com/org-roam/org-roam synced 2025-08-01 12:17:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

(fix): fix id-face killing buffers (#1218)

Browse Source 
org-roam-id-get-file no longer falls back onto the current buffer: It queries the org-roam database, and optionally org-id-locations, and declares that it does not exist if it isn't in either.
This commit is contained in:
Jethro Kuan
2020-10-27 00:25:39 +08:00
committed by GitHub
parent ac2044b84b
commit 0d235686f4
3 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
org-roam.el
View File

@ -1046,14 +1046,21 @@ citation key, for Org-ref cite links."
:where ,@conditions
:order-by (asc source)])))
(defun org-roam-id-get-file (id)
"Return the file if ID exists in the Org-roam database.
(defun org-roam-id-get-file (id &optional strict)
"Return the file if ID exists.
When STRICT is non-nil, only consider Org-roam's database.
Return nil otherwise."
(caar (org-roam-db-query [:select [file]
:from ids
:where (= id $s1)
:limit 1]
id)))
(or (caar (org-roam-db-query [:select [file]
:from ids
:where (= id $s1)
:limit 1]
id))
(and (not strict)
(progn
(unless org-id-locations (org-id-locations-load))
(or (and org-id-locations
(hash-table-p org-id-locations)
(gethash id org-id-locations)))))))
(defun org-roam-id-find (id &optional markerp strict keep-buffer-p)
"Return the location of the entry with the id ID.
@ -1061,8 +1068,7 @@ When MARKERP is non-nil, return a marker pointing to the headline.
Otherwise, return a cons formatted as \(file . pos).
When STRICT is non-nil, only consider Org-roam’s database.
When KEEP-BUFFER-P is non-nil, keep the buffers navigated by Org-roam open."
(let ((file (or (org-roam-id-get-file id)
(unless strict (org-id-find-id-file id)))))
(let ((file (org-roam-id-get-file id strict)))
(when file
(let ((existing-buf (find-buffer-visiting file))
(res (org-id-find-id-in-file id file markerp)))
@ -1238,17 +1244,15 @@ file."
(org-roam--org-roam-file-p)))
(custom (or (and in-note org-roam-link-use-custom-faces)
(eq org-roam-link-use-custom-faces 'everywhere))))
(cond ((and custom
(not (org-roam-id-get-file id))
(not (and (eq org-roam-link-use-custom-faces 'everywhere)
(org-id-find id))))
'org-roam-link-invalid)
((and (org-roam--in-buffer-p)
(cond ((and (org-roam--in-buffer-p)
(org-roam--backlink-to-current-p))
'org-roam-link-current)
((and custom
(org-roam-id-get-file id))
(org-roam-id-get-file id t))
'org-roam-link)
((and custom
(not (org-roam-id-get-file id)))
'org-roam-link-invalid)
(t
'org-link)))))