[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ef52e66: (ls-lisp-insert-directory): Make -B work
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master ef52e66: (ls-lisp-insert-directory): Make -B work |
Date: |
Tue, 23 Feb 2016 10:19:54 +0000 |
branch: master
commit ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e
Author: Drew Adams <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
(ls-lisp-insert-directory): Make -B work
* lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work
(bug#20776).
---
lisp/ls-lisp.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 6b5304c..85e91cd 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
file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs
regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does
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))
(default-directory dir) ; so that file-attributes works
(file-alist
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ef52e66: (ls-lisp-insert-directory): Make -B work,
Lars Ingebrigtsen <=