Hoist duplicated condition-case

This commit is contained in:
Chris Barrett
2022-09-15 19:43:53 +12:00
parent 75c27eb1ee
commit b7a4d5a75a

View File

@@ -356,9 +356,12 @@ and old content."
(error "Dynamic block not terminated")))
(current-content (buffer-substring-no-properties content-start content-end))
(updated-content
(condition-case-unless-debug err
(pcase-exhaustive name
("notes" (org-roam-dblocks-format-notes params))
("backlinks" (org-roam-dblocks-format-backlinks params))))
("backlinks" (org-roam-dblocks-format-backlinks params)))
(error
(error-message-string err))))
(content-changed-p (not (equal current-content
updated-content)))
@@ -381,8 +384,6 @@ and old content."
;;; Backlinks dblock type
(defun org-roam-dblocks-format-backlinks (params)
(condition-case-unless-debug err
(progn
(org-roam-dblocks-args-assert params t)
(setf (plist-get params :forbidden-ids)
@@ -396,11 +397,9 @@ and old content."
(seq-sort 'org-roam-dblocks--link-sorting)
(seq-map #'org-roam-dblocks--link-to-list-item))))
(string-join lines "\n")))
(error (error-message-string err))))
;;;###autoload
(defalias 'org-dblock-write:backlinks #'org-roam-dblocks--write-content)
;;;###autoload
(defun org-insert-dblock:backlinks ()
"Insert a dynamic block backlinks at point."
@@ -415,8 +414,6 @@ and old content."
;;; Roam notes search dblock type
(defun org-roam-dblocks-format-notes (params)
(condition-case-unless-debug err
(progn
(org-roam-dblocks-args-assert params t)
(cl-assert (or (org-roam-dblocks-args-match params)
(org-roam-dblocks-args-tags params)
@@ -433,7 +430,6 @@ and old content."
(seq-sort #'org-roam-dblocks--link-sorting)
(seq-map #'org-roam-dblocks--link-to-list-item))))
(string-join lines "\n")))
(error (error-message-string err))))
;;;###autoload
(defalias 'org-dblock-write:notes #'org-roam-dblocks--write-content)