(eshell-ls-insert-directory): Set font-lock-defaults to nil, to

prevent fontification in dired buffers, if Eshell's ls is being used.

2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e217312a7b..a85a874f130 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-11  John Wiegley  <johnw@gnu.org>
+
+        * eshell/em-ls.el (eshell-ls-insert-directory): Set
+        font-lock-defaults to nil, to prevent fontification in dired
+        buffers, if Eshell's ls is being used.
+
 2001-04-10  John Wiegley  <johnw@gnu.org>
 
         * calendar/timeclock.el (timeclock-completing-read): new function.
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 97a342b73ac..efafbc0d502 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -255,6 +255,7 @@ instead."
         (when (and eshell-ls-use-colors
                    (featurep 'font-lock))
           (font-lock-mode -1)
+          (setq font-lock-defaults nil)
           (if (boundp 'font-lock-buffers)
               (set 'font-lock-buffers
                    (delq (current-buffer)