master 51b9acb 3/4: Assume font-lock is provided; it's preloaded since 22.1

[Stefan Kangas]

branch: master
commit 51b9acbeccf2c62be02d1312d665ea4233d60922
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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.
---
 lisp/cedet/semantic/format.el | 11 ++++-------
 lisp/epa.el                   |  1 -
 lisp/erc/erc.el               |  1 -
 lisp/eshell/em-ls.el          |  3 +--
 lisp/generic-x.el             |  2 --
 lisp/net/dig.el               |  6 ++----
 lisp/net/sieve-mode.el        |  2 --
 lisp/progmodes/cperl-mode.el  |  2 +-
 lisp/progmodes/idlw-help.el   | 21 ++++++++++-----------
 lisp/progmodes/idlwave.el     | 15 +++++++--------
 lisp/progmodes/prolog.el      |  3 ---
 lisp/textmodes/rst.el         |  2 --
 12 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index bb2954b..e972015 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -32,7 +32,6 @@
 ;;
 
 ;;; Code:
-(eval-when-compile (require 'font-lock))
 (require 'semantic)
 (require 'semantic/tag-ls)
 (require 'ezimage)
@@ -119,12 +118,10 @@ be used unless font lock is a feature.")
   "Apply onto TEXT a color associated with FACE-CLASS.
 FACE-CLASS is a tag type found in `semantic-format-face-alist'.
 See that variable for details on adding new types."
-  (if (featurep 'font-lock)
-      (let ((face (cdr-safe (assoc face-class semantic-format-face-alist)))
-           (newtext (concat text)))
-       (put-text-property 0 (length text) 'face face newtext)
-       newtext)
-    text))
+  (let ((face (cdr-safe (assoc face-class semantic-format-face-alist)))
+        (newtext (concat text)))
+    (put-text-property 0 (length text) 'face face newtext)
+    newtext))
 
 (defun semantic--format-colorize-merge-text (precoloredtext face-class)
   "Apply onto PRECOLOREDTEXT a color associated with FACE-CLASS.
diff --git a/lisp/epa.el b/lisp/epa.el
index 25e055c..4e28828 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -24,7 +24,6 @@
 ;;; Dependencies
 
 (require 'epg)
-(require 'font-lock)
 (eval-when-compile (require 'subr-x))
 (require 'derived)
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e35ae0c..bf7b16d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -58,7 +58,6 @@
 (load "erc-loaddefs" nil t)
 
 (require 'cl-lib)
-(require 'font-lock)
 (require 'format-spec)
 (require 'pp)
 (require 'thingatpt)
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index e10be8e..6b306f7 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)
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index b56b631..5875dce 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -107,8 +107,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'font-lock))
-
 (defgroup generic-x nil
   "A collection of generic modes."
   :prefix "generic-"
diff --git a/lisp/net/dig.el b/lisp/net/dig.el
index f369991..da4ea405 100644
--- a/lisp/net/dig.el
+++ b/lisp/net/dig.el
@@ -127,10 +127,8 @@ Buffer should contain output generated by `dig-invoke'."
   "Major mode for displaying dig output."
   (buffer-disable-undo)
   (setq-local font-lock-defaults '(dig-font-lock-keywords t))
-  (when (featurep 'font-lock)
-    ;; FIXME: what is this for??  --Stef
-    (font-lock-set-defaults))
-  )
+  ;; FIXME: what is this for??  --Stef M
+  (font-lock-set-defaults))
 
 (defun dig-exit ()
   "Quit dig output buffer."
diff --git a/lisp/net/sieve-mode.el b/lisp/net/sieve-mode.el
index c5f4491..05e9747 100644
--- a/lisp/net/sieve-mode.el
+++ b/lisp/net/sieve-mode.el
@@ -43,8 +43,6 @@
 
 (autoload 'sieve-manage "sieve")
 (autoload 'sieve-upload "sieve")
-(eval-when-compile
-  (require 'font-lock))
 
 (defgroup sieve nil
   "Sieve."
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 3f24b10..b7dc59b 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -400,7 +400,7 @@ Font for POD headers."
   :version "21.1"
   :group 'cperl-faces)
 
-(defcustom cperl-pod-here-fontify '(featurep 'font-lock)
+(defcustom cperl-pod-here-fontify t
   "Not-nil after evaluation means to highlight POD and here-docs sections."
   :type 'boolean
   :group 'cperl-faces)
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 2d4ea46..89296ff 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -1173,17 +1173,16 @@ When DING is non-nil, ring the bell as well."
 Useful when source code is displayed as help.  See the option
 `idlwave-help-fontify-source-code'."
   (interactive)
-  (if (featurep 'font-lock)
-      (let ((major-mode 'idlwave-mode)
-           (font-lock-verbose
-            (if (called-interactively-p 'interactive) font-lock-verbose nil)))
-       (with-syntax-table idlwave-mode-syntax-table
-          (set (make-local-variable 'font-lock-defaults)
-               idlwave-font-lock-defaults)
-          (if (fboundp 'font-lock-ensure) ; Emacs >= 25.1
-              (font-lock-ensure)
-            ;; Silence "interactive use only" warning on Emacs >= 25.1.
-            (with-no-warnings (font-lock-fontify-buffer)))))))
+  (let ((major-mode 'idlwave-mode)
+        (font-lock-verbose
+         (if (called-interactively-p 'interactive) font-lock-verbose nil)))
+    (with-syntax-table idlwave-mode-syntax-table
+      (set (make-local-variable 'font-lock-defaults)
+           idlwave-font-lock-defaults)
+      (if (fboundp 'font-lock-ensure) ; Emacs >= 25.1
+          (font-lock-ensure)
+        ;; Silence "interactive use only" warning on Emacs >= 25.1.
+        (with-no-warnings (font-lock-fontify-buffer))))))
 
 
 (defun idlwave-help-error (name type class keyword)
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 1cb54d6..5c1e822 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -7642,14 +7642,13 @@ associated TAG, if any."
 
 (defun idlwave-completion-fontify-classes ()
   "Goto the *Completions* buffer and fontify the class info."
-  (when (featurep 'font-lock)
-    (with-current-buffer "*Completions*"
-      (save-excursion
-       (goto-char (point-min))
-       (let ((buffer-read-only nil))
-         (while (re-search-forward "\\.*<[^>]+>" nil t)
-           (put-text-property (match-beginning 0) (match-end 0)
-                              'face 'font-lock-string-face)))))))
+  (with-current-buffer "*Completions*"
+    (save-excursion
+      (goto-char (point-min))
+      (let ((buffer-read-only nil))
+        (while (re-search-forward "\\.*<[^>]+>" nil t)
+          (put-text-property (match-beginning 0) (match-end 0)
+                             'face 'font-lock-string-face))))))
 
 (defun idlwave-uniquify (list)
   (let ((ht (make-hash-table :size (length list) :test 'equal)))
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 124f652..75e95d9 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -261,7 +261,6 @@
 (require 'comint)
 
 (eval-when-compile
-  (require 'font-lock)
   ;; We need imenu everywhere because of the predicate index!
   (require 'imenu)
   ;)
@@ -1883,8 +1882,6 @@ Argument BOUND is a buffer position limiting searching."
 ;; Set everything up
 (defun prolog-font-lock-keywords ()
   "Set up font lock keywords for the current Prolog system."
-  ;;(when window-system
-  (require 'font-lock)
 
   ;; Define Prolog faces
   (defface prolog-redo-face
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index adda28c..7a7ac47 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -3578,8 +3578,6 @@ Region is from BEG to END.  With WITH-EMPTY prefix empty 
lines too."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Font lock
 
-(require 'font-lock)
-
 ;; FIXME: The obsolete variables need to disappear.
 
 ;; The following versions have been done inside Emacs and should not be