[Helm] Expand ‘db/important-documents-path’ before removing it
This commit is contained in:
parent
9b8c2ca7a7
commit
0803cd9abb
|
@ -301,27 +301,28 @@ The result will be a list of cons cells, where the car is the
|
|||
path relative to `db/important-documents’ and the cdr is the full
|
||||
path."
|
||||
;; code adapted from `directory-files-recursively’
|
||||
(cl-labels ((all-files-in-dir (dir)
|
||||
(let ((result nil)
|
||||
(files nil))
|
||||
(dolist (file (sort (file-name-all-completions "" dir)
|
||||
'string<))
|
||||
(unless (eq ?. (aref file 0)) ; omit hidden files
|
||||
(if (directory-name-p file)
|
||||
(let* ((leaf (substring file 0 (1- (length file))))
|
||||
(full-file (expand-file-name leaf dir)))
|
||||
;; Don't follow symlinks to other directories.
|
||||
(unless (file-symlink-p full-file)
|
||||
(setq result
|
||||
(nconc result (all-files-in-dir full-file)))))
|
||||
(push (cons
|
||||
(string-remove-prefix db/important-documents-path
|
||||
(expand-file-name file dir))
|
||||
(expand-file-name file dir))
|
||||
files))))
|
||||
(nconc result (nreverse files)))))
|
||||
(when (file-directory-p db/important-documents-path)
|
||||
(all-files-in-dir db/important-documents-path))))
|
||||
(let ((db/important-documents-path (expand-file-name db/important-documents-path)))
|
||||
(cl-labels ((all-files-in-dir (dir)
|
||||
(let ((result nil)
|
||||
(files nil))
|
||||
(dolist (file (sort (file-name-all-completions "" dir)
|
||||
'string<))
|
||||
(unless (eq ?. (aref file 0)) ; omit hidden files
|
||||
(if (directory-name-p file)
|
||||
(let* ((leaf (substring file 0 (1- (length file))))
|
||||
(full-file (expand-file-name leaf dir)))
|
||||
;; Don't follow symlinks to other directories.
|
||||
(unless (file-symlink-p full-file)
|
||||
(setq result
|
||||
(nconc result (all-files-in-dir full-file)))))
|
||||
(push (cons
|
||||
(string-remove-prefix db/important-documents-path
|
||||
(expand-file-name file dir))
|
||||
(expand-file-name file dir))
|
||||
files))))
|
||||
(nconc result (nreverse files)))))
|
||||
(when (file-directory-p db/important-documents-path)
|
||||
(all-files-in-dir db/important-documents-path)))))
|
||||
|
||||
(defun db/system-open (path)
|
||||
"Open PATH with default program as defined by the underlying system."
|
||||
|
|
Loading…
Reference in New Issue