branch: externals/denote
commit 46c49e51ee8454b93293e7208f57d32ac3e4c603
Author: Alvin Hsu <[email protected]>
Commit: Alvin Hsu <[email protected]>
Fix error in denote-sort-dired when regexp is a subdirectory
In the DIRNAME list argument to `dired', the first element is treated as a
directory name, with the rest being file paths relative to that directory.
`dired' appears to fall back to the parent directory when DIRED-NAME does
not
match any subdirectory, resulting in expected correct behavior; however,
when
there is a matched directory, it will attempt to search for files relative
to
that directory instead, which may result in file-not-found errors.
Thus, we remove and replace DIRED-NAME such that we always use the directory
that the files are supposed to be relative to.
Fixes: #662
---
README.org | 6 ++----
denote.el | 12 ++++--------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/README.org b/README.org
index 329cc7f593..e4d7f6eaa1 100644
--- a/README.org
+++ b/README.org
@@ -4635,9 +4635,8 @@ Empty files are those that satisfy
`my-denote--note-has-no-contents-p'."
(car (denote-directories))
(denote-directories-get-common-root)))
(files (funcall files-fn))
- (dired-name (format-message files-matching-regexp))
(buffer-name (funcall denote-sort-dired-buffer-name-function
(format "%s (EMPTY)" files-matching-regexp) sort-by-component reverse-sort
exclude-regexp)))
- (denote-sort-dired--prepare-buffer directory files-fn dired-name
buffer-name)
+ (denote-sort-dired--prepare-buffer directory files-fn buffer-name)
(message "No matching files for: %s" files-matching-regexp))))
(defun my-denote-sort-dired-without-empty-files (files-matching-regexp
sort-by-component reverse exclude-regexp)
@@ -4656,9 +4655,8 @@ Empty files are those that satisfy
`my-denote--note-has-no-contents-p'."
(car (denote-directories))
(denote-directories-get-common-root)))
(files (funcall files-fn))
- (dired-name (format-message files-matching-regexp))
(buffer-name (funcall denote-sort-dired-buffer-name-function
(format "%s (OMIT EMPTY)" files-matching-regexp) sort-by-component reverse-sort
exclude-regexp)))
- (denote-sort-dired--prepare-buffer directory files-fn dired-name
buffer-name)
+ (denote-sort-dired--prepare-buffer directory files-fn buffer-name)
(message "No matching files for: %s" files-matching-regexp))))
(defun my-denote-sort-dired-all-empty-files ()
diff --git a/denote.el b/denote.el
index 7b38563356..f0ff30d3d8 100644
--- a/denote.el
+++ b/denote.el
@@ -1922,7 +1922,7 @@ If REVERSE is nil, use the value of the user option
"\n"
(propertize "No more matching files" 'face 'warning))))
-(defun denote-sort-dired--prepare-buffer (directory files-fn dired-name
buffer-name)
+(defun denote-sort-dired--prepare-buffer (directory files-fn buffer-name)
"Prepare buffer for `denote-sort-dired'.
DIRECTORY is an absolute path to the `default-directory' of the Dired
listing.
@@ -1930,13 +1930,10 @@ listing.
FILES-FN is a function that returns the files to be listed in the Dired
buffer.
-DIRED-NAME is a string passed to Dired as (cons DIRED-NAME FILES)),
-where FILES is the return value of FILES-FN.
-
BUFFER-NAME is the name of the resulting buffer."
(let* ((default-directory directory)
(files (funcall files-fn))
- (dired-buffer (dired (cons dired-name files))))
+ (dired-buffer (dired (cons directory files))))
(with-current-buffer dired-buffer
(rename-buffer buffer-name :unique)
(setq-local revert-buffer-function
@@ -1944,7 +1941,7 @@ BUFFER-NAME is the name of the resulting buffer."
(if-let* ((default-directory directory)
(files (funcall files-fn)))
(progn
- (setq-local dired-directory (cons dired-name files))
+ (setq-local dired-directory (cons directory files))
(dired-revert))
(denote-dired-empty-mode)))))
buffer-name))
@@ -1989,9 +1986,8 @@ When called from Lisp, the arguments are a string, a
symbol among
(car roots)
(denote-directories-get-common-root)))
(files (funcall files-fn))
- (dired-name (format-message files-matching-regexp))
(buffer-name (funcall denote-sort-dired-buffer-name-function
files-matching-regexp sort-by-component reverse-sort exclude-regexp)))
- (denote-sort-dired--prepare-buffer directory files-fn dired-name
buffer-name)
+ (denote-sort-dired--prepare-buffer directory files-fn buffer-name)
(message "No matching files for: %s" files-matching-regexp))))
(defalias 'denote-dired 'denote-sort-dired
