From: Glenn Morris Date: Thu, 23 May 2013 04:48:40 +0000 (-0700) Subject: * lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~227^2~11 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a;p=emacs.git * lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36ee6a1a64b..0f3c16101d3 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 73ed617b871..e087861d7d9 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)))