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 capture

Browse Source
This commit is contained in:
Jethro Kuan
2021-03-13 17:59:40 +08:00
parent d1dd75e3b2
commit 6fae3aa74c
1 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
org-roam-capture.el
View File

@ -259,34 +259,31 @@ the capture)."
(defun org-roam-capture--finalize () (defun org-roam-capture--finalize ()
"Finalize the `org-roam-capture' process." "Finalize the `org-roam-capture' process."
(let* ((finalize (org-roam-capture--get :finalize)) (let ((region (org-roam-capture--get :region)))
;; In case any regions were shielded before, unshield them
(region (when-let ((region (org-roam-capture--get :region)))
(org-roam-unshield-region (car region) (cdr region))))
(beg (car region))
(end (cdr region)))
(unless org-note-abort
(pcase finalize
('find-file
(when-let ((file-path (org-roam-capture--get :file-path)))
(find-file file-path)
(run-hooks 'org-roam-capture-after-find-file-hook)))
('insert-link
(when-let* ((mkr (org-roam-capture--get :insert-at))
(buf (marker-buffer mkr)))
(with-current-buffer buf
(when region
(delete-region (car region) (cdr region)))
(let ((path (org-roam-capture--get :file-path))
(type (org-roam-capture--get :link-type))
(desc (org-roam-capture--get :link-description)))
(if (eq (point) (marker-position mkr))
(insert (org-roam-format-link path desc type))
(org-with-point-at mkr
(insert (org-roam-format-link path desc type))))))))))
(when region (when region
(set-marker beg nil) (org-roam-unshield-region (car region) (cdr region)))
(set-marker end nil)) (unless org-note-abort
(let* ((capture-buf (org-capture-get :buffer))
(pos (org-capture-get :exact-position))
(id (with-current-buffer capture-buf
(org-with-point-at pos
(org-id-get-create)))))
(pcase (org-roam-capture--get :finalize)
('find-file
(switch-to-buffer capture-buf))
('insert-link
(when-let* ((mkr (org-roam-capture--get :insert-at))
(buf (marker-buffer mkr)))
(with-current-buffer buf
(when region
(delete-region (car region) (cdr region)))
(let ((path (org-roam-capture--get :file-path))
(desc (org-roam-capture--get :link-description)))
(org-with-point-at mkr
(insert (org-link-make-string (concat "id:" id) desc))))
(when region
(set-marker (car region) nil)
(set-marker (cdr region) nil))))))))
(org-roam-capture--save-file-maybe) (org-roam-capture--save-file-maybe)
(remove-hook 'org-capture-after-finalize-hook #'org-roam-capture--finalize))) (remove-hook 'org-capture-after-finalize-hook #'org-roam-capture--finalize)))
@ -528,12 +525,6 @@ This function is used solely in Org-roam's capture templates: see
(append converted options `(:org-roam ,org-roam-plist)))) (append converted options `(:org-roam ,org-roam-plist))))
(_ (user-error "Invalid capture template format: %s" template)))) (_ (user-error "Invalid capture template format: %s" template))))
(defcustom org-roam-capture-after-find-file-hook nil
"Hook that is run right after an Org-roam capture process is finalized.
Suitable for moving point."
:group 'org-roam
:type 'hook)
(defcustom org-roam-capture-function #'org-capture (defcustom org-roam-capture-function #'org-capture
"Function that is invoked to start the `org-capture' process." "Function that is invoked to start the `org-capture' process."
:group 'org-roam :group 'org-roam