emacs/protesilaos.denote
1
0
Fork 0
mirror of https://github.com/protesilaos/denote.git synced 2026-09-10 07:16:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make rename commands not interfere with existing front matter indentation

Browse source 
This is to address the comment posted by Morten Kjeldgaard in issue
703: <https://github.com/protesilaos/denote/issues/703>.
This commit is contained in:
Protesilaos 2026-05-01 18:40:39 +03:00
parent 06c520de36
commit 8e6d83c652
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
denote.el
View file

@ -2782,6 +2782,26 @@ or `line', referring to what the function should retrieve."
(denote--file-with-temp-buffer file (denote--file-with-temp-buffer file
(re-search-forward regexp nil t 1))) (re-search-forward regexp nil t 1)))
(defun denote--get-front-matter-value-no-indentation (component line file-type)
"Return the COMPONENT on LINE given the FILE-TYPE without any indentation."
(with-temp-buffer
(insert line)
(goto-char (point-min))
(when (re-search-forward (funcall (denote--get-component-key-regexp-function component) file-type) nil t 1)
(re-search-forward "\\s-*" (line-end-position) t)
(buffer-substring-no-properties (point) (line-end-position)))))
(defun denote--rewrite-front-matter-line (component new-line file-type)
"Rewrite COMPONENT with NEW-LINE given the FILE-TYPE.
Preserve the existing key and the spacing, if any, that follows it.
Return non-nil if successful."
(when (re-search-forward (funcall (denote--get-component-key-regexp-function component) file-type) nil t 1)
(let ((new-value (denote--get-front-matter-value-no-indentation component new-line file-type)))
(re-search-forward "\\s-*" (line-end-position) t)
(delete-region (point) (line-end-position))
(insert new-value)
t)))
;; These are private front matter retrieval functions, working with a content parameter ;; These are private front matter retrieval functions, working with a content parameter
(defmacro denote--define-retrieve-front-matter-from-content (component scope) (defmacro denote--define-retrieve-front-matter-from-content (component scope)
@ -4034,10 +4054,7 @@ related."
(save-restriction (save-restriction
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward (denote--keywords-key-regexp file-type) nil t 1) (when (denote--rewrite-front-matter-line 'keywords new-keywords-line file-type)
(goto-char (line-beginning-position))
(insert new-keywords-line)
(delete-region (point) (line-end-position))
(when save-buffer (save-buffer)))))))) (when save-buffer (save-buffer))))))))
(defun denote--component-has-value-p (component value) (defun denote--component-has-value-p (component value)
@ -4261,10 +4278,7 @@ prompt to confirm the rewriting of the front matter."
((memq component components-to-add) ((memq component components-to-add)
(insert (concat new-line "\n"))) (insert (concat new-line "\n")))
((memq component components-to-modify) ((memq component components-to-modify)
(re-search-forward (funcall component-key-regexp-function file-type) nil t 1) (denote--rewrite-front-matter-line component new-line file-type)
(goto-char (line-beginning-position))
(insert new-line)
(delete-region (point) (line-end-position))
(goto-char (line-beginning-position 2))) (goto-char (line-beginning-position 2)))
(t (t
(goto-char (line-beginning-position 2)))))))))))))) (goto-char (line-beginning-position 2))))))))))))))