mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-13 03:06:23 -08:00
(ls-lisp-insert-directory): Make -B work
* lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work
(bug#20776).
Backport:
(cherry picked from commit ef52e66efd)
This commit is contained in:
parent
42bc065a6a
commit
dfe16506a9
1 changed files with 3 additions and 1 deletions
|
|
@ -348,7 +348,9 @@ SWITCHES is a *list* of characters. TIME-INDEX is the time index into
|
||||||
file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs
|
file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs
|
||||||
regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does
|
regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does
|
||||||
not contain `d', so that a full listing is expected."
|
not contain `d', so that a full listing is expected."
|
||||||
(if (or wildcard-regexp full-directory-p)
|
(if (or (and wildcard-regexp
|
||||||
|
(not (string= "[^~]\\'" wildcard-regexp))) ; Switch -B pseudo-wildcard regexp
|
||||||
|
full-directory-p)
|
||||||
(let* ((dir (file-name-as-directory file))
|
(let* ((dir (file-name-as-directory file))
|
||||||
(default-directory dir) ; so that file-attributes works
|
(default-directory dir) ; so that file-attributes works
|
||||||
(file-alist
|
(file-alist
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue