[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112674: * lisp/eshell/em-ls.el (eshe
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112674: * lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling. |
Date: |
Wed, 22 May 2013 21:48:40 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112674
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-22 21:48:40 -0700
message:
* lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
modified:
lisp/ChangeLog
lisp/eshell/em-ls.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-22 15:28:42 +0000
+++ b/lisp/ChangeLog 2013-05-23 04:48:40 +0000
@@ -1,3 +1,7 @@
+2013-05-23 Glenn Morris <address@hidden>
+
+ * eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
+
2013-05-22 Leo Liu <address@hidden>
* progmodes/octave.el (inferior-octave-startup): Fix bug#14433.
=== modified file 'lisp/eshell/em-ls.el'
--- a/lisp/eshell/em-ls.el 2013-02-08 15:47:07 +0000
+++ b/lisp/eshell/em-ls.el 2013-05-23 04:48:40 +0000
@@ -552,7 +552,7 @@
(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 @@
(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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112674: * lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.,
Glenn Morris <=