# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 948752174 0
# Node ID d30c57a6b35cf6db88a63ce684bcb717d27c0f73
# Parent  d63305047238662ccab15a5e15effe74335fa286
(turn-on-font-lock): Don't depend on window-system &c.

diff -r d63305047238 -r d30c57a6b35c lisp/font-lock.el
--- a/lisp/font-lock.el	Mon Jan 24 15:38:44 2000 +0000
+++ b/lisp/font-lock.el	Mon Jan 24 22:16:14 2000 +0000
@@ -1,6 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
-;; Copyright (C) 1992-1999 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999
+;;  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm <simon@gnu.org>
 ;; Maintainer: FSF
@@ -729,7 +730,7 @@
 (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) (or window-system (tty-display-color-p)))
+  (unless font-lock-mode
     (font-lock-mode)))
 
 ;;;###autoload