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: refactor org-roam-capture--get-if-new-target-a (#1818)

Browse Source 
It looks like Emacs' byte compiler is very naive and cannot properly
sometimes compile closures, which causes error like in #1814, at least
on Emacsen <28. One of the possible solutions is to write the code using
less abstractions in between, so the byte compiler would do the right
thing when arranging instructions.

Possibly addresses #1814.
This commit is contained in:
Wetlize
2021-08-28 16:48:56 +03:00
committed by GitHub
parent 0e6b93a253
commit 48a5d01726
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
org-roam-compat.el
View File

@ -153,17 +153,18 @@ nodes." org-id-locations-file)
(expand-file-name ".orgids" (file-truename org-roam-directory))) (expand-file-name ".orgids" (file-truename org-roam-directory)))
(apply fn args))))))) (apply fn args)))))))
;;;; Deprecated :if-new capture template keyword
(with-eval-after-load 'org-roam-capture (with-eval-after-load 'org-roam-capture
;; :if-new capture template property is deprecated in favor of :target (add-to-list 'org-roam-capture--template-keywords :if-new))
(add-to-list 'org-roam-capture--template-keywords :if-new)
(advice-add 'org-roam-capture--get-target :around #'org-roam-capture--get-if-new-target-a) (advice-add 'org-roam-capture--get-target :around #'org-roam-capture--get-if-new-target-a)
(let ((warning-was-displayed 'dont-display)) ; REVIEW Set this to nil close to next major release (defalias 'org-roam-capture--get-if-new-target-a
(defun org-roam-capture--get-if-new-target-a (fn &rest args) (let ((inhibit-warning-p t)) ; REVIEW Set this to nil close to next major release
(lambda (fn &rest args)
"Get the current capture target using deprecated :if-new property." "Get the current capture target using deprecated :if-new property."
(if-let ((target (org-roam-capture--get :if-new))) (if-let ((target (org-roam-capture--get :if-new)))
(prog1 target (prog1 target
(unless warning-was-displayed (unless inhibit-warning-p
(lwarn 'org-roam-capture :warning (lwarn 'org-roam-capture :warning
(mapconcat (mapconcat
#'identity #'identity
@ -173,7 +174,7 @@ nodes." org-id-locations-file)
"in your capture templates to `:target'."] "in your capture templates to `:target'."]
"\n")) "\n"))
;; Don't irritate the user too much. Displaying the warning once per session should be enough. ;; Don't irritate the user too much. Displaying the warning once per session should be enough.
(setq warning-was-displayed t))) (setq inhibit-warning-p t)))
(apply fn args))))) (apply fn args)))))
;;; Obsolete aliases (remove after next major release) ;;; Obsolete aliases (remove after next major release)