[Emacs-diffs] Changes to emacs/lisp/eshell/em-ls.el

[John Wiegley]

Index: emacs/lisp/eshell/em-ls.el
diff -c emacs/lisp/eshell/em-ls.el:1.22 emacs/lisp/eshell/em-ls.el:1.23
*** emacs/lisp/eshell/em-ls.el:1.22     Mon Aug  1 15:04:33 2005
--- emacs/lisp/eshell/em-ls.el  Tue Nov  1 07:03:20 2005
***************
*** 279,285 ****
        (if (stringp switches)
          (setq switches (split-string switches)))
        (let (eshell-current-handles
!           eshell-current-subjob-p)
        ;; use the fancy highlighting in `eshell-ls' rather than font-lock
        (when (and eshell-ls-use-colors
                   (featurep 'font-lock))
--- 279,286 ----
        (if (stringp switches)
          (setq switches (split-string switches)))
        (let (eshell-current-handles
!           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,326 ****
    (defvar show-recursive)
    (defvar show-size)
    (defvar sort-method)
!   (defvar ange-cache))
  
  (defun eshell-do-ls (&rest args)
    "Implementation of \"ls\" in Lisp, passing ARGS."
--- 321,328 ----
    (defvar show-recursive)
    (defvar show-size)
    (defvar sort-method)
!   (defvar ange-cache)
!   (defvar dired-flag))
  
  (defun eshell-do-ls (&rest args)
    "Implementation of \"ls\" in Lisp, passing ARGS."
***************
*** 333,339 ****
     `((?a "all" nil show-all
         "show all files in directory")
       (?c nil by-ctime sort-method
!        "sort by modification time")
       (?d "directory" nil dir-literal
         "list directory entries instead of contents")
       (?k "kilobytes" 1024 block-size
--- 335,341 ----
     `((?a "all" nil show-all
         "show all files in directory")
       (?c nil by-ctime sort-method
!        "sort by last status change time")
       (?d "directory" nil dir-literal
         "list directory entries instead of contents")
       (?k "kilobytes" 1024 block-size
***************
*** 372,377 ****
--- 374,381 ----
         "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"