summaryrefslogtreecommitdiff
path: root/lisp/eshell/em-ls.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2020-11-19 02:56:34 +0100
committerStefan Kangas <stefan@marxist.se>2020-11-19 04:37:37 +0100
commit51b9acbeccf2c62be02d1312d665ea4233d60922 (patch)
tree8b6ed424ca04ea48ae4e51b730723802b4671ae5 /lisp/eshell/em-ls.el
parent7cda88250fb1ab370e12ad4e4db84a17559c6c91 (diff)
downloademacs-51b9acbeccf2c62be02d1312d665ea4233d60922.tar.gz
emacs-51b9acbeccf2c62be02d1312d665ea4233d60922.tar.bz2
emacs-51b9acbeccf2c62be02d1312d665ea4233d60922.zip
Assume font-lock is provided; it's preloaded since 22.1
* lisp/cedet/semantic/format.el (semantic--format-colorize-text): * lisp/eshell/em-ls.el (eshell-ls--insert-directory): * lisp/net/dig.el (dig-mode): * lisp/progmodes/cperl-mode.el (cperl-pod-here-fontify): * lisp/progmodes/idlw-help.el (idlwave-help-fontify): * lisp/progmodes/idlwave.el (idlwave-completion-fontify-classes): Don't check for feature 'font-lock; it has been preloaded since 22.1. * lisp/cedet/semantic/format.el (font-lock): * lisp/epa.el (font-lock): * lisp/erc/erc.el (font-lock): * lisp/generic-x.el (font-lock): * lisp/net/sieve-mode.el (font-lock): * lisp/progmodes/prolog.el (font-lock): * lisp/textmodes/rst.el (font-lock): Remove unnecessary require.
Diffstat (limited to 'lisp/eshell/em-ls.el')
-rw-r--r--lisp/eshell/em-ls.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index e10be8e6232..6b306f77874 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -270,8 +270,7 @@ instead."
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))
+ (when eshell-ls-use-colors
(font-lock-mode -1)
(setq font-lock-defaults nil)
(if (boundp 'font-lock-buffers)