mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00
Code Issues Releases Activity

(file-expand-wildcards): Never consider .' and ..' a

Browse Source 
wildcard match.  Fix regexp that tests if dirpart contains
wildcard characters.
This commit is contained in:
Andreas Schwab 1999-01-29 11:31:33 +00:00
parent 13911e1d18
commit 18b0f8cf6e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/files.el
View File

@ -3112,7 +3112,7 @@ default directory. However, if FULL is non-nil, they are absolute."
;; A list of all dirs that DIRPART specifies.
;; This can be more than one dir
;; if DIRPART contains wildcards.
(dirs (if (and dirpart (string-match "[[.*+\\^$?]" dirpart))
(dirs (if (and dirpart (string-match "[[*?]" dirpart))
(mapcar 'file-name-as-directory
(file-expand-wildcards (directory-file-name dirpart)))
(list dirpart)))
@ -3121,8 +3121,14 @@ default directory. However, if FULL is non-nil, they are absolute."
(when (or (null (car dirs)) ; Possible if DIRPART is not wild.
(file-directory-p (directory-file-name (car dirs))))
(let ((this-dir-contents
(directory-files (or (car dirs) ".") full
(wildcard-to-regexp nondir))))
;; Filter out "." and ".."
(delq nil
(mapcar #'(lambda (name)
(unless (string-match "\\`\\.\\.?\\'"
(file-name-nondirectory name))
name))
(directory-files (or (car dirs) ".") full
(wildcard-to-regexp nondir))))))
(setq contents
(nconc
(if (and (car dirs) (not full))