diff options
| author | Glenn Morris | 2013-05-22 21:48:40 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-22 21:48:40 -0700 |
| commit | d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a (patch) | |
| tree | 932444495ece519e24b374830b9219b49ef35b33 /lisp/eshell | |
| parent | d8a6e1afd33941647753f08350263d42626801f3 (diff) | |
| download | emacs-d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a.tar.gz emacs-d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a.zip | |
* lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-ls.el | 6 |
1 files changed, 3 insertions, 3 deletions
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." | |||
| 552 | (expand-file-name dir))) | 552 | (expand-file-name dir))) |
| 553 | (cdr dirinfo))) ":\n")) | 553 | (cdr dirinfo))) ":\n")) |
| 554 | (let ((entries (eshell-directory-files-and-attributes | 554 | (let ((entries (eshell-directory-files-and-attributes |
| 555 | dir nil (and (not show-all) | 555 | dir nil (and (not (or show-all show-almost-all)) |
| 556 | eshell-ls-exclude-hidden | 556 | eshell-ls-exclude-hidden |
| 557 | "\\`[^.]") t | 557 | "\\`[^.]") t |
| 558 | ;; Asking for UID and GID as | 558 | ;; Asking for UID and GID as |
| @@ -565,9 +565,9 @@ relative to that directory." | |||
| 565 | (setq entries | 565 | (setq entries |
| 566 | (cl-remove-if | 566 | (cl-remove-if |
| 567 | (lambda (entry) | 567 | (lambda (entry) |
| 568 | (member (caar entry) '("." ".."))) | 568 | (member (car entry) '("." ".."))) |
| 569 | entries))) | 569 | entries))) |
| 570 | (when (and (not show-all) | 570 | (when (and (not (or show-all show-almost-all)) |
| 571 | eshell-ls-exclude-regexp) | 571 | eshell-ls-exclude-regexp) |
| 572 | (while (and entries (string-match eshell-ls-exclude-regexp | 572 | (while (and entries (string-match eshell-ls-exclude-regexp |
| 573 | (caar entries))) | 573 | (caar entries))) |