*** empty log message ***

[gnu-emacs] / lisp / eshell / em-ls.el

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index a42544bf985c92e56792b24e05b491decf49e570..f705ca0e375d9ce1b6af934d8ee695845592dd76 100644 (file)
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,7 +1,7 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -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"