Remove redundant requires of 'font-lock'

* lisp/cedet/data-debug.el:
* lisp/hi-lock.el:
* lisp/htmlfontify.el:
* lisp/org/org.el:
* lisp/progmodes/cperl-mode.el:
* lisp/progmodes/cwarn.el: Don't require 'font-lock'; it is preloaded
since version 22.1.

diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 44cce389cb3cef25d24934cf16b4a276c0550267..54b9024ebe2313f1d8fcf620d11b998674fca759 100644 (file)
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -42,7 +42,6 @@
 ;;       (data-debug-show-stuff stuff "myStuff"))
 ;;     stuff))
 
-(require 'font-lock)
 (require 'ring)
 
 ;;; Code:

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 536a1af84620dec39489b5d4e13b877f68336d4b..51887b702c1173dac6e798769e243102069f2d3a 100644 (file)
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -87,8 +87,6 @@
 
 ;;; Code:
 
-(require 'font-lock)
-
 (defgroup hi-lock nil
   "Interactively add and remove font-lock patterns for highlighting text."
   :link '(custom-manual "(emacs)Highlight Interactively")

diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 6a2ed3aee92309052c185c29451f90cf4fce7481..4977e08c3da590a2319914464abecdc56e356469 100644 (file)
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -80,8 +80,6 @@
 (eval-when-compile (require 'cl-lib))
 (require 'custom)
 ;;  (`defgroup' `defcustom')
-(require 'font-lock)
-;;  (`font-lock-fontify-region')
 (require 'cus-edit)
 
 (require 'htmlfontify-loaddefs)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index de7dded158a30406090f55613930732fa3433d2a..5dc9fa9d8dcfeb3dff54613b606519593a1040c6 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5004,8 +5004,6 @@ the rounding returns a past time."
 
 ;;;; Font-Lock stuff, including the activators
 
-(require 'font-lock)
-
 (defconst org-match-sexp-depth 3
   "Number of stacked braces for sub/superscript matching.")
 

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 20b23602589a3b436a2f34745bbeb7a0cee111c9..48f0a34880e209fe43bef614fcea6548cc492458 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -5457,7 +5457,6 @@ indentation and initial hashes.  Behaves usually outside of comment."
 (defun cperl-init-faces ()
   (condition-case errs
       (progn
-       (require 'font-lock)
        (let (t-font-lock-keywords t-font-lock-keywords-1 font-lock-anchored)
          (setq font-lock-anchored t)
          (setq

diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 6e84f4f1bcc1be722401000ad55b3b483ac5b864..0571739344e5001950d8e7ffec78ace825160de8 100644 (file)
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -105,7 +105,6 @@
 ;;{{{ Dependencies
 
 (require 'custom)
-(require 'font-lock)
 (require 'cc-mode)
 
 ;;}}}