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

Merge pull request #664 from aurtzy/fix-denote-sort-dired

Browse source 
Fix error in denote-sort-dired when regexp is a subdirectory
This commit is contained in:
Protesilaos Stavrou 2026-01-09 10:01:36 +02:00 committed by GitHub
parent 9e02bf4bd0 46c49e51ee
commit 89875abad6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.org
View file

@ -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 ()

12
denote.el
View file

@ -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