procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2013-05-22 21:48:40 -07:00
parent d8a6e1afd3
commit d361bc10dc
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
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>
* progmodes/octave.el (inferior-octave-startup): Fix bug#14433.

6
lisp/eshell/em-ls.el
View file

@ -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)))