From d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 22 May 2013 21:48:40 -0700 Subject: [PATCH] * lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling. --- lisp/ChangeLog | 4 ++++ lisp/eshell/em-ls.el | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36ee6a1a64..0f3c16101d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-05-23 Glenn Morris + + * eshell/em-ls.el (eshell-ls-dir): Fix -A handling. + 2013-05-22 Leo Liu * progmodes/octave.el (inferior-octave-startup): Fix bug#14433. diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 73ed617b87..e087861d7d 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -552,7 +552,7 @@ relative to that directory." (expand-file-name dir))) (cdr dirinfo))) ":\n")) (let ((entries (eshell-directory-files-and-attributes - dir nil (and (not show-all) + dir nil (and (not (or show-all show-almost-all)) eshell-ls-exclude-hidden "\\`[^.]") t ;; Asking for UID and GID as @@ -565,9 +565,9 @@ relative to that directory." (setq entries (cl-remove-if (lambda (entry) - (member (caar entry) '("." ".."))) + (member (car entry) '("." ".."))) entries))) - (when (and (not show-all) + (when (and (not (or show-all show-almost-all)) eshell-ls-exclude-regexp) (while (and entries (string-match eshell-ls-exclude-regexp (caar entries))) -- 2.20.1