From 0a4aa2894297c0fd9e735328bbb60b427e0ba5d4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 3 Dec 2020 08:50:14 +0100 Subject: [PATCH] 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. --- lisp/cedet/data-debug.el | 1 - lisp/hi-lock.el | 2 -- lisp/htmlfontify.el | 2 -- lisp/org/org.el | 2 -- lisp/progmodes/cperl-mode.el | 1 - lisp/progmodes/cwarn.el | 1 - 6 files changed, 9 deletions(-) diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index 44cce389cb3..54b9024ebe2 100644 --- 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 536a1af8462..51887b702c1 100644 --- 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 6a2ed3aee92..4977e08c3da 100644 --- 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 de7dded158a..5dc9fa9d8dc 100644 --- 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 20b23602589..48f0a34880e 100644 --- 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 6e84f4f1bcc..0571739344e 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -105,7 +105,6 @@ ;;{{{ Dependencies (require 'custom) -(require 'font-lock) (require 'cc-mode) ;;}}} -- 2.39.5