diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-08-15 06:52:34 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-08-15 06:52:34 +0000 |
| commit | 4aa8cbfb163090bc678a30ae6458eafacd7e59e6 (patch) | |
| tree | 57a75789ce03eb568f7c7ef1a5f7a3c23d8c84f5 | |
| parent | 6ad38dc0acb6370bf5a65688fc891e67ae789e5b (diff) | |
| download | emacs-4aa8cbfb163090bc678a30ae6458eafacd7e59e6.tar.gz | |
(eshell-ls-files): List one per line in a pipeline. (Bug#699)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/eshell/em-ls.el | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa439380097..96ec3e8c1d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-08-15 Glenn Morris <rgm@gnu.org> + + * eshell/em-ls.el (eshell-ls-files): List one per line in a pipeline. + (Bug#699) + 2008-08-13 Martin Rudalics <rudalics@gmx.at> * emacs-lisp/find-func.el (find-library): Wrap search for diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index a31fb26b5f1..bdfe66420fb 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -638,7 +638,12 @@ In Eshell's implementation of ls, ENTRIES is always reversed." "Output a list of FILES. Each member of FILES is either a string or a cons cell of the form \(FILE . ATTRS)." - (if (memq listing-style '(long-listing single-column)) + ;; Mimic behavior of coreutils ls, which lists a single file per + ;; line when output is not a tty. Exceptions: if -x was supplied. + ;; Not really the same since not testing output destination. + (if (or (and eshell-in-pipeline-p + (not (eq listing-style 'by-lines))) + (memq listing-style '(long-listing single-column))) (eshell-for file files (if file (eshell-ls-file file size-width copy-fileinfo))) |