diff options
| author | Craig Jennings <c@cjennings.net> | 2026-05-03 19:24:40 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-05-03 19:24:40 -0500 |
| commit | 389e85c020e7e59977e3c832a281f8b7844fecd4 (patch) | |
| tree | 6ae03c43882120a7dcd534d0a09a91fe609fdbd5 /modules/custom-buffer-file.el | |
| parent | c2f355bf601fd9b7db0107c163c64432a7ae9a80 (diff) | |
| download | dotemacs-389e85c020e7e59977e3c832a281f8b7844fecd4.tar.gz dotemacs-389e85c020e7e59977e3c832a281f8b7844fecd4.zip | |
fix: use file basename when moving buffer + file
`cj/--move-buffer-and-file` was building the destination as `(concat dir "/" (buffer-name))`. If the buffer had been renamed via `M-x rename-buffer`, or uniquified by Emacs with a `<2>` suffix when a second buffer visited the same filename, the move wrote a file with the wrong name on disk.
I derived the destination basename from `buffer-file-name` instead, in both the internal helper and the interactive wrapper. The wrapper's overwrite-prompt now also formats the real target filename rather than the buffer name.
I added two regression tests: one for a renamed buffer visiting `original.txt`, and one for a `<2>` uniquified buffer with a trailing-slash target directory.
Diffstat (limited to 'modules/custom-buffer-file.el')
| -rw-r--r-- | modules/custom-buffer-file.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/custom-buffer-file.el b/modules/custom-buffer-file.el index f99a0ee4..ce635cd0 100644 --- a/modules/custom-buffer-file.el +++ b/modules/custom-buffer-file.el @@ -110,11 +110,12 @@ If OK-IF-EXISTS is non-nil, overwrite existing file. Returns t on success, nil if buffer not visiting a file." (let* ((name (buffer-name)) (filename (buffer-file-name)) + (basename (and filename (file-name-nondirectory filename))) (dir (expand-file-name dir)) (dir (if (string-match "[/\\\\]$" dir) (substring dir 0 -1) dir)) - (newname (concat dir "/" name))) + (newname (and basename (expand-file-name basename dir)))) (if (not filename) (progn (message "Buffer '%s' is not visiting a file!" name) @@ -129,7 +130,10 @@ Returns t on success, nil if buffer not visiting a file." "Move both current buffer and the file it visits to DIR. When called interactively, prompts for confirmation if target file exists." (interactive (list (read-directory-name "Move buffer and file (to new directory): "))) - (let* ((target (expand-file-name (buffer-name) (expand-file-name dir)))) + (let* ((filename (buffer-file-name)) + (target (expand-file-name + (file-name-nondirectory (or filename (buffer-name))) + (expand-file-name dir)))) (condition-case _ (cj/--move-buffer-and-file dir nil) (file-already-exists |