branch: externals/denote-org
commit ef9146ab1e1c901d2204433bbb8cf2acd974d10b
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Make stylistic tweaks to the dynamic block for denote-sequence
The original was contributed by Peter Prevos in pull request 9:
<https://github.com/protesilaos/denote-org/pull/9>.
Peter has assigned copyright to the Free Software Foundation.
---
denote-org.el | 87 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 44 insertions(+), 43 deletions(-)
diff --git a/denote-org.el b/denote-org.el
index ab9f04db48..ce005b9886 100644
--- a/denote-org.el
+++ b/denote-org.el
@@ -961,7 +961,12 @@ Used by `org-dblock-update' with PARAMS provided by the
dynamic block."
;;;;; Dynamic block to insert hierarchic sequences
-;;;###autoload
+;; NOTE 2025-08-12: I am putting the autoloads here because I am now
+;; how they behave inside the `with-eval-after-load'.
+
+;;;###autoload (autoload 'denote-org-dblock-insert-sequence "denote-org")
+;;;###autoload (autoload 'org-dblock-write:denote-sequence "denote-org")
+
(with-eval-after-load 'denote-sequence
(defun denote-org-dblock-insert-sequence (file depth)
"Create Org dynamic block to list all chilren of FILE up to a relative
DEPTH.
@@ -971,73 +976,69 @@ DEPTH of the root FILE is 1. Using 2 lists children, 3
grandchildren, and so on.
(denote-sequence-file-prompt
(format "List descendants of:"
(propertize
- (denote--rename-dired-file-or-current-file-or-prompt)
- 'face 'denote-faces-prompt-current-name)))
+ (denote--rename-dired-file-or-current-file-or-prompt)
+ 'face 'denote-faces-prompt-current-name)))
(read-number "Maximum relative depth from root node: " 2))
(org-mode))
(org-create-dblock (list :name "denote-sequence"
:sequence (denote-retrieve-filename-signature
file)
- :depth depth))
- (org-update-dblock)))
+ :depth depth))
+ (org-update-dblock))
-;;;###autoload
-(with-eval-after-load 'denote-sequence
- (defun org-dblock-write:denote-sequence (params)
- "Function to update `denote-sequence' Org Dynamic blocks.
-When sequence is an empty string, then use all Denote files with a sequence.
-
-Used by `org-dblock-update' with PARAMS provided by the dynamic block."
- (let* ((block-name (plist-get params :block-name))
- (sequence (plist-get params :sequence))
- (depth (plist-get params :depth))
- ;; This will not work for people with bespoke
`denote-file-name-components-order'
- (parent (denote-directory-files (concat sequence "-")))
- (children (denote-sequence-get-relative sequence 'all-children))
- (family (if children
- (append parent children)
- (denote-sequence-get-all-files)))
- (files (denote-sequence-get-files-with-max-depth depth family)))
- (when block-name (insert "#+name: " block-name "\n"))
- (denote-org--insert-sequence files)
- (join-line))))
-
-(with-eval-after-load 'denote-sequence
- (defun denote-sequence-get-files-with-max-depth (max-depth &optional files)
+ (defun denote-org-sequence--get-files-with-max-depth (max-depth &optional
files)
"Return members of FILES with sequence depth less or equal than MAX-DEPTH.
When no FILES are provided, use all files with a sequence signature."
(unless files
(setq files (denote-sequence-get-all-files)))
(let* ((hierarchy '())
- (files (denote-sequence-sort-files files))
- (root-sequence (denote-retrieve-filename-signature (car files)))
+ (files (denote-sequence-sort-files files))
+ (root-sequence (denote-retrieve-filename-signature (car files)))
(root-depth (denote-sequence-depth root-sequence)))
(message (number-to-string root-depth))
(dolist (file files)
- (let* ((sequence (denote-retrieve-filename-signature file))
+ (let* ((sequence (denote-retrieve-filename-signature file))
(depth (denote-sequence-depth sequence)))
(when (<= depth (- (+ root-depth max-depth) 1))
(push file hierarchy))))
- (nreverse hierarchy))))
+ (nreverse hierarchy)))
+
+ (defun org-dblock-write:denote-sequence (params)
+ "Function to update `denote-sequence' Org Dynamic blocks.
+When sequence is an empty string, then use all Denote files with a sequence.
+
+Used by `org-dblock-update' with PARAMS provided by the dynamic block."
+ (let* ((block-name (plist-get params :block-name))
+ (sequence (plist-get params :sequence))
+ (depth (plist-get params :depth))
+ ;; This will not work for people with bespoke
`denote-file-name-components-order'
+ (parent (denote-directory-files (concat sequence "-")))
+ (children (denote-sequence-get-relative sequence 'all-children))
+ (family (if children
+ (append parent children)
+ (denote-sequence-get-all-files)))
+ (files (denote-org-sequence--get-files-with-max-depth depth
family)))
+ (when block-name (insert "#+name: " block-name "\n"))
+ (denote-org--insert-sequence files)
+ (join-line)))
-(with-eval-after-load 'denote-sequence
(defun denote-org--insert-sequence (files)
"Insert indented list of links to sequence FILES."
(let* ((root-sequence (denote-retrieve-filename-signature (car files)))
- (root-depth (denote-sequence-depth root-sequence))
- (links '()))
+ (root-depth (denote-sequence-depth root-sequence))
+ (links '()))
(message "Inserting %s links" (length files))
(dolist (file files)
- (let* ((sequence (denote-retrieve-filename-signature file))
- (description (denote-get-link-description file))
- (link-title (concat sequence ": " description))
+ (let* ((sequence (denote-retrieve-filename-signature file))
+ (description (denote-get-link-description file))
+ (link-title (concat sequence ": " description))
(link (denote-format-link file link-title 'org nil))
- (depth (- (denote-sequence-depth sequence) root-depth))
- (indent (make-string (* depth 2) ?\s))
- (link-as-list-item (format (concat indent
denote-link--prepare-links-format) link)))
- (push link-as-list-item links)))
+ (depth (- (denote-sequence-depth sequence) root-depth))
+ (indent (make-string (* depth 2) ?\s))
+ (link-as-list-item (format (concat indent
denote-link--prepare-links-format) link)))
+ (push link-as-list-item links)))
(setq links (nreverse links))
(dolist (link links)
- (insert link)))))
+ (insert link)))))
;;;
