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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e217312a7bbff981a1eb4faeb5f5d8a9f081689..a85a874f13073e9cce71a36e97fa5e98adeb9caa 100644 (file)
--- 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 97a342b73acb846091dbd8741877ea3c5e6f88bc..efafbc0d502280e24b35c3bd663b52a98353ac14 100644 (file)
--- 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)