Commit 73f99a66 authored by John Wiegley's avatar John Wiegley
Browse files

(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.
parent 669dc0a1
2005-11-01 John Wiegley <johnw@newartisans.com> 2005-11-01 John Wiegley <johnw@newartisans.com>
   
* net/eudcb-mab.el (eudc-mab-query-internal): Added backend
support for OS/X's AddressBook, by calling out to the open source
program "contacts" (installable through Fink).
* net/eudc.el (eudc-expand-inline): If the
`eudc-multiple-match-handling-method' is set to `all', delete the
query string before inserting the query result.
* eshell/em-ls.el (eshell-do-ls): Added no-op support for --dired * eshell/em-ls.el (eshell-do-ls): Added no-op support for --dired
flag, to prevent Eshell from using the system ls when flag, to prevent Eshell from using the system ls when
`eshell-ls-insert-directory' is in used. `eshell-ls-insert-directory' is in used.
......
...@@ -279,7 +279,8 @@ instead." ...@@ -279,7 +279,8 @@ instead."
(if (stringp switches) (if (stringp switches)
(setq switches (split-string switches))) (setq switches (split-string switches)))
(let (eshell-current-handles (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 ;; use the fancy highlighting in `eshell-ls' rather than font-lock
(when (and eshell-ls-use-colors (when (and eshell-ls-use-colors
(featurep 'font-lock)) (featurep 'font-lock))
...@@ -320,7 +321,8 @@ instead." ...@@ -320,7 +321,8 @@ instead."
(defvar show-recursive) (defvar show-recursive)
(defvar show-size) (defvar show-size)
(defvar sort-method) (defvar sort-method)
(defvar ange-cache)) (defvar ange-cache)
(defvar dired-flag))
(defun eshell-do-ls (&rest args) (defun eshell-do-ls (&rest args)
"Implementation of \"ls\" in Lisp, passing ARGS." "Implementation of \"ls\" in Lisp, passing ARGS."
...@@ -333,7 +335,7 @@ instead." ...@@ -333,7 +335,7 @@ instead."
`((?a "all" nil show-all `((?a "all" nil show-all
"show all files in directory") "show all files in directory")
(?c nil by-ctime sort-method (?c nil by-ctime sort-method
"sort by modification time") "sort by last status change time")
(?d "directory" nil dir-literal (?d "directory" nil dir-literal
"list directory entries instead of contents") "list directory entries instead of contents")
(?k "kilobytes" 1024 block-size (?k "kilobytes" 1024 block-size
...@@ -372,6 +374,8 @@ instead." ...@@ -372,6 +374,8 @@ instead."
"sort alphabetically by entry extension") "sort alphabetically by entry extension")
(?1 nil single-column listing-style (?1 nil single-column listing-style
"list one file per line") "list one file per line")
(nil "dired" nil dired-flag
"Here for compatibility with GNU ls.")
(nil "help" nil nil (nil "help" nil nil
"show this usage display") "show this usage display")
:external "ls" :external "ls"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment