summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2000-01-24 22:16:14 +0000
committerDave Love <fx@gnu.org>2000-01-24 22:16:14 +0000
commit01b691481a6c45de50eb52b1c9653c7dd6980d28 (patch)
tree6b9b8df8d48570912d9484b12924eed248c24ef2 /lisp/font-lock.el
parent1e5279b950b8e22e3f4d774151ac06c40b775962 (diff)
downloademacs-01b691481a6c45de50eb52b1c9653c7dd6980d28.tar.gz
(turn-on-font-lock): Don't depend on window-system &c.
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c0dab76b0c8..cecc933b621 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -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 @@ 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) (or window-system (tty-display-color-p)))
+ (unless font-lock-mode
(font-lock-mode)))
;;;###autoload