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

Fix to signature losing "="s when file is renamed.

Browse source 
Four file renaming commands may lose spaces (denoted by the "="
in existing filenames) when the user renames the file:

1. denote-rename-file
2. denote-dired-rename-files
3. denote-dired-rename-marked-files-with-keywords
4. denote-rename-file-using-front-matter

This is caused by the function `denote-sluggify-signature`, which
calls (indirectly) `denote--slug-no-punct`, which removes, among
many other characters, all "="s, which represent spaces.  These
spaces are thus lost even if the user does not change the
signature.

To remedy this situation, all "="s are turned into spaces before
being sent to `denote--slug-no-punct`, as spaces are not removed
by this function.  The function `denote--slug-put-equals` turns
these spaces into "="s at the end of the file-renaming operation.
This commit is contained in:
wlharvey4 2023-12-22 02:11:43 -08:00
parent 4cf8b34e13
commit 80c062f14c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
denote.el
View file

@ -2507,7 +2507,9 @@ file-naming scheme."
(interactive
(let* ((file (denote--rename-dired-file-or-prompt))
(file-type (denote-filetype-heuristics file))
(file-in-prompt (propertize (file-relative-name file) 'face 'denote-faces-prompt-current-name)))
(file-in-prompt (propertize (file-relative-name file) 'face 'denote-faces-prompt-current-name))
(signature-or-nil (denote-retrieve-filename-signature file))
(spaced-signature (if signature-or-nil (string-replace "=" " " signature-or-nil) "")))
(list
file
(denote-title-prompt
@ -2516,9 +2518,8 @@ file-naming scheme."
(denote-keywords-prompt
(format "Rename `%s' with keywords (empty to ignore/remove)" file-in-prompt)
(denote-convert-file-name-keywords-to-crm (denote-retrieve-filename-keywords file)))
(denote-signature-prompt
(or (denote-retrieve-filename-signature file) "")
(format "Rename `%s' with signature (empty to ignore/remove)" file-in-prompt))
(denote-signature-prompt spaced-signature
(format "Rename `%s' with signature (empty to ignore/remove)" file-in-prompt))
current-prefix-arg)))
(let* ((dir (file-name-directory file))
(id (or (denote-retrieve-filename-identifier file)
@ -2562,8 +2563,10 @@ the changes made to the file: perform them outright."
(keywords (denote-keywords-prompt
(format "Rename `%s' with keywords (empty to ignore/remove)" file-in-prompt)
(denote-convert-file-name-keywords-to-crm (denote-retrieve-filename-keywords file))))
(signature-or-nil (denote-retrieve-filename-signature file))
(spaced-signature (if signature-or-nil (string-replace "=" " " signature-or-nil) ""))
(signature (denote-signature-prompt
(or (denote-retrieve-filename-signature file) "")
spaced-signature
(format "Rename `%s' with signature (empty to ignore/remove)" file-in-prompt)))
(extension (denote-get-file-extension file))
(new-name (denote-format-file-name dir id keywords (denote-sluggify title 'title) extension (denote-sluggify-signature signature))))
@ -2625,7 +2628,8 @@ Specifically, do the following:
(let* ((dir (file-name-directory file))
(id (or (denote-retrieve-filename-identifier file)
(denote-create-unique-file-identifier file used-ids)))
(signature (or (denote-retrieve-filename-signature file) ""))
(signature-or-nil (denote-retrieve-filename-signature file))
(signature (if signature-or-nil (string-replace "=" " " signature-or-nil) ""))
(file-type (denote-filetype-heuristics file))
(title (denote--retrieve-title-or-filename file file-type))
(extension (denote-get-file-extension file))
@ -2669,7 +2673,8 @@ does internally."
(id (denote-retrieve-filename-identifier file)))
(let* ((sluggified-title (denote-sluggify title 'title))
(keywords (denote-retrieve-front-matter-keywords-value file file-type))
(signature (or (denote-retrieve-filename-signature file) ""))
(signature-or-nil (denote-retrieve-filename-signature file))
(signature (if signature-or-nil (string-replace "=" " " signature-or-nil) ""))
(extension (denote-get-file-extension file))
(dir (file-name-directory file))
(new-name (denote-format-file-name dir id keywords sluggified-title extension (when signature (denote-sluggify-signature signature)))))