(fast-lock-mode): Don't try to turn on

font-lock-mode if it's off.  Print a warning instead.

diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 8b7101b382ab6400f1894e68116256a5c3f1666b..495e95706ca70c0fbb61240fcaed92097dd4aed1 100644 (file)
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -379,8 +379,9 @@ For saving, see variables `fast-lock-minimum-size', `fast-lock-save-events',
            (if arg (> (prefix-numeric-value arg) 0) (not fast-lock-mode))))
   (if (and fast-lock-mode (not font-lock-mode))
       ;; Turned on `fast-lock-mode' rather than `font-lock-mode'.
-      (let ((font-lock-support-mode 'fast-lock-mode))
-       (font-lock-mode t))
+      (progn
+        (message "Use font-lock-support-mode rather than calling fast-lock-mode")
+        (sit-for 2))
     ;; Let's get down to business.
     (set (make-local-variable 'fast-lock-cache-timestamp) nil)
     (set (make-local-variable 'fast-lock-cache-filename) nil)