From 73f99a662dcefaf4687b37d17a501f24569e573c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 1 Nov 2005 07:07:05 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 8 ++++++++ lisp/eshell/em-ls.el | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6745905d5de..771eabab74e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,13 @@ 2005-11-01 John Wiegley + * 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 flag, to prevent Eshell from using the system ls when `eshell-ls-insert-directory' is in used. 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" -- 2.39.5