From: Dave Love <fx@gnu.org>
Date: Fri, 23 Jul 1999 16:44:54 +0000 (+0000)
Subject: (turn-on-font-lock): Use tty-display-color-p.
X-Git-Tag: emacs-pretest-21.0.90~7392
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a33209e8ef4da4f1b7db38d87db7f8bbfec4ace6;p=emacs.git

(turn-on-font-lock): Use tty-display-color-p.
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6dac89577ba..f0257182eef 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -714,7 +714,7 @@ buffer local value for `font-lock-defaults', via its mode hook."
 (defun turn-on-font-lock ()
   "Turn on Font Lock mode conditionally.
 Turn on only if the terminal can display it."
-  (when (and (not font-lock-mode) window-system)
+  (when (and (not font-lock-mode) (or window-system (tty-display-color-p)))
     (font-lock-mode)))
 
 ;;;###autoload