Commit d361bc10 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.

parent d8a6e1af
2013-05-23 Glenn Morris <rgm@gnu.org>
* eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
2013-05-22 Leo Liu <sdl.web@gmail.com> 2013-05-22 Leo Liu <sdl.web@gmail.com>
   
* progmodes/octave.el (inferior-octave-startup): Fix bug#14433. * progmodes/octave.el (inferior-octave-startup): Fix bug#14433.
......
...@@ -552,7 +552,7 @@ relative to that directory." ...@@ -552,7 +552,7 @@ relative to that directory."
(expand-file-name dir))) (expand-file-name dir)))
(cdr dirinfo))) ":\n")) (cdr dirinfo))) ":\n"))
(let ((entries (eshell-directory-files-and-attributes (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 eshell-ls-exclude-hidden
"\\`[^.]") t "\\`[^.]") t
;; Asking for UID and GID as ;; Asking for UID and GID as
...@@ -565,9 +565,9 @@ relative to that directory." ...@@ -565,9 +565,9 @@ relative to that directory."
(setq entries (setq entries
(cl-remove-if (cl-remove-if
(lambda (entry) (lambda (entry)
(member (caar entry) '("." ".."))) (member (car entry) '("." "..")))
entries))) entries)))
(when (and (not show-all) (when (and (not (or show-all show-almost-all))
eshell-ls-exclude-regexp) eshell-ls-exclude-regexp)
(while (and entries (string-match eshell-ls-exclude-regexp (while (and entries (string-match eshell-ls-exclude-regexp
(caar entries))) (caar entries)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment