diff options
| author | John Wiegley <johnw@newartisans.com> | 2005-11-01 07:07:05 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2005-11-01 07:07:05 +0000 |
| commit | 73f99a662dcefaf4687b37d17a501f24569e573c (patch) | |
| tree | 94f41706fa05280e4a54ba5c0bf30d7c6322ab81 /lisp/eshell/em-ls.el | |
| parent | 669dc0a115c603f247e6724ff83e435919f7e3c6 (diff) | |
| download | emacs-73f99a662dcefaf4687b37d17a501f24569e573c.tar.gz | |
(eshell-do-ls): Added no-op support for --dired flag, to prevent
Eshell from using the system ls when `eshell-ls-insert-directory' is
in used.
(eshell-ls-insert-directory): Disable font-lock in directory buffer so
that Eshell's own fontification is seen. This broke recently due to
changes in font-lock, so this goes back to version 21 behavior.
Diffstat (limited to 'lisp/eshell/em-ls.el')
| -rw-r--r-- | lisp/eshell/em-ls.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index a42544bf985..24b61aa492f 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -279,7 +279,8 @@ instead." (if (stringp switches) (setq switches (split-string switches))) (let (eshell-current-handles - eshell-current-subjob-p) + eshell-current-subjob-p + font-lock-mode) ;; use the fancy highlighting in `eshell-ls' rather than font-lock (when (and eshell-ls-use-colors (featurep 'font-lock)) @@ -320,7 +321,8 @@ instead." (defvar show-recursive) (defvar show-size) (defvar sort-method) - (defvar ange-cache)) + (defvar ange-cache) + (defvar dired-flag)) (defun eshell-do-ls (&rest args) "Implementation of \"ls\" in Lisp, passing ARGS." @@ -333,7 +335,7 @@ instead." `((?a "all" nil show-all "show all files in directory") (?c nil by-ctime sort-method - "sort by modification time") + "sort by last status change time") (?d "directory" nil dir-literal "list directory entries instead of contents") (?k "kilobytes" 1024 block-size @@ -372,6 +374,8 @@ instead." "sort alphabetically by entry extension") (?1 nil single-column listing-style "list one file per line") + (nil "dired" nil dired-flag + "Here for compatibility with GNU ls.") (nil "help" nil nil "show this usage display") :external "ls" |