Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2021-05-21 18:30:23 +02:00
commit 52b09799cf
1 changed files with 1 additions and 1 deletions

View File

@ -15451,7 +15451,7 @@ used by the agenda files. If ARCHIVE is `ifmode', do this only if
(if (file-directory-p f) (if (file-directory-p f)
(directory-files (directory-files
f t org-agenda-file-regexp) f t org-agenda-file-regexp)
(list f))) (list (expand-file-name f org-directory))))
files))) files)))
(when org-agenda-skip-unavailable-files (when org-agenda-skip-unavailable-files
(setq files (delq nil (setq files (delq nil