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

simplify

Browse Source
This commit is contained in:
Jethro Kuan
2021-04-01 23:35:05 +08:00
parent 3d61a76ecb
commit eec1edf8f5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
org-roam.el
View File

@@ -64,7 +64,6 @@
(defvar org-ref-cite-types) (defvar org-ref-cite-types)
(declare-function org-ref-split-and-strip-string "ext:org-ref-utils" (string)) (declare-function org-ref-split-and-strip-string "ext:org-ref-utils" (string))
;; From org-id.el ;; From org-id.el
(defvar org-id-link-to-org-use-id)
(declare-function org-id-find-id-in-file "ext:org-id" (id file &optional markerp)) (declare-function org-id-find-id-in-file "ext:org-id" (id file &optional markerp))
(defgroup org-roam nil (defgroup org-roam nil
@@ -495,6 +494,12 @@ nodes."
:group 'org-roam :group 'org-roam
:type 'string) :type 'string)
(defun org-roam--tags-to-str (tags)
"Convert list of TAGS into a string."
(string-join
(mapcar (lambda (s) (concat "#" s)) tags)
" "))
(defun org-roam-node--format-entry (node width) (defun org-roam-node--format-entry (node width)
"Formats NODE for display in the results list. "Formats NODE for display in the results list.
WIDTH is the width of the results list." WIDTH is the width of the results list."
@@ -508,7 +513,7 @@ WIDTH is the width of the results list."
(field-value (or (funcall getter node) ""))) (field-value (or (funcall getter node) "")))
(when (and (equal field-name "tags") (when (and (equal field-name "tags")
field-value) field-value)
(setq field-value (string-join field-value " "))) (setq field-value (org-roam--tags-to-str field-value)))
(when (and (equal field-name "file") (when (and (equal field-name "file")
field-value) field-value)
(setq field-value (file-relative-name field-value org-roam-directory))) (setq field-value (file-relative-name field-value org-roam-directory)))
@@ -584,11 +589,11 @@ is the `org-roam-node'."
:title title :title title
:point pos :point pos
:tags (gethash id tags-table))) :tags (gethash id tags-table)))
(tag-str (string-join (mapcar (lambda (s) (concat "#" s)) (tag-str (org-roam--tags-to-str (org-roam-node-tags node))))
(org-roam-node-tags node)) " ")))
(cons (propertize (concat tag-str " " alias) (cons (propertize (concat tag-str " " alias)
'node node 'node node
'display (org-roam-node--format-entry node (1- (frame-width)))) node))))) 'display (org-roam-node--format-entry node (1- (frame-width))))
node)))))
(defun org-roam-node-read (&optional initial-input filter-fn require-match) (defun org-roam-node-read (&optional initial-input filter-fn require-match)
"Read and return an `org-roam-node'. "Read and return an `org-roam-node'.