aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2016-02-23 21:12:55 +1100
committerLars Ingebrigtsen2016-02-23 21:12:55 +1100
commitef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e (patch)
tree4653c6c127198e2d4391c4eaa65b24b3be87882c
parentc399756dda232efa8eebdd105d7d466cff02589a (diff)
downloademacs-ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e.tar.gz
emacs-ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e.zip
(ls-lisp-insert-directory): Make -B work
* lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work (bug#20776).
-rw-r--r--lisp/ls-lisp.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 6b5304caada..85e91cdadc0 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -348,7 +348,9 @@ SWITCHES is a *list* of characters. TIME-INDEX is the time index into
348file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs 348file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs
349regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does 349regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does
350not contain `d', so that a full listing is expected." 350not contain `d', so that a full listing is expected."
351 (if (or wildcard-regexp full-directory-p) 351 (if (or (and wildcard-regexp
352 (not (string= "[^~]\\'" wildcard-regexp))) ; Switch -B pseudo-wildcard regexp
353 full-directory-p)
352 (let* ((dir (file-name-as-directory file)) 354 (let* ((dir (file-name-as-directory file))
353 (default-directory dir) ; so that file-attributes works 355 (default-directory dir) ; so that file-attributes works
354 (file-alist 356 (file-alist