From 64269125156836060eb95b28b01b877c74e800d8 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 25 Aug 2023 01:40:20 +0200 Subject: [PATCH] ; Delete redundant defvars; font-lock is preloaded --- lisp/emacs-lisp/lisp-mode.el | 5 ----- lisp/emacs-lisp/pp.el | 1 - lisp/gnus/gnus-cite.el | 6 ------ lisp/gnus/mm-view.el | 2 -- lisp/mail/rmail.el | 4 +--- lisp/org/org.el | 1 - lisp/progmodes/cperl-mode.el | 2 -- lisp/progmodes/f90.el | 1 - lisp/progmodes/idlw-help.el | 1 - lisp/progmodes/idlwave.el | 1 - lisp/progmodes/sh-script.el | 7 +------ lisp/progmodes/sql.el | 4 ---- lisp/textmodes/reftex-ref.el | 1 - lisp/textmodes/reftex.el | 4 ---- lisp/textmodes/tex-mode.el | 6 +----- lisp/vc/cvs-status.el | 1 - lisp/vc/smerge-mode.el | 4 ---- lisp/vc/vc-git.el | 1 - lisp/vc/vc-hg.el | 1 - lisp/woman.el | 2 -- 20 files changed, 3 insertions(+), 52 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 3bf9a2f10db..b1fc65b09ac 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -31,11 +31,6 @@ (eval-when-compile (require 'cl-lib)) (eval-when-compile (require 'subr-x)) -(defvar font-lock-comment-face) -(defvar font-lock-doc-face) -(defvar font-lock-keywords-case-fold-search) -(defvar font-lock-string-face) - (define-abbrev-table 'lisp-mode-abbrev-table () "Abbrev table for Lisp mode.") diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index 95ad222cc4d..50e0e7d1da4 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -25,7 +25,6 @@ ;;; Code: (require 'cl-lib) -(defvar font-lock-verbose) (defgroup pp nil "Pretty printer for Emacs Lisp." diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el index d9071491ed4..a3c24ea05d9 100644 --- a/lisp/gnus/gnus-cite.el +++ b/lisp/gnus/gnus-cite.el @@ -1117,12 +1117,6 @@ Returns nil if there is no such line before LIMIT, t otherwise." (setq count (1+ count)))))) ;; "Keywords for highlighting different levels of message citations.") -(defvar font-lock-defaults-computed) -(defvar font-lock-keywords) -(defvar font-lock-set-defaults) - -(autoload 'font-lock-set-defaults "font-lock") - (define-minor-mode gnus-message-citation-mode "Minor mode providing more font-lock support for nested citations. When enabled, it automatically turns on `font-lock-mode'." diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 2c407353559..47d2b5f57e6 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -487,8 +487,6 @@ after inserting the part." (let ((inhibit-read-only t)) (delete-region beg end))))))))) -;; Shut up byte-compiler. -(defvar font-lock-mode-hook) (defun mm-display-inline-fontify (handle &optional mode) "Insert HANDLE inline fontifying with MODE. If MODE is not set, try to find mode automatically." diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 716848dc34f..f76600000c9 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1,7 +1,6 @@ ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1985-1988, 1993-1998, 2000-2023 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985-2023 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail @@ -90,7 +89,6 @@ its character representation and its display representation.") (defvar deleted-head) -(defvar font-lock-fontified) (defvar mail-abbrev-syntax-table) (defvar mail-abbrevs) (defvar messages-head) diff --git a/lisp/org/org.el b/lisp/org/org.el index 175e095e806..f56aa4f6f69 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -3760,7 +3760,6 @@ This is needed for font-lock setup.") (defvar calc-embedded-close-formula) (defvar calc-embedded-open-formula) (defvar calc-embedded-open-mode) -(defvar font-lock-unfontify-region-function) (defvar org-agenda-tags-todo-honor-ignore-options) (defvar remember-data-file) (defvar texmathp-why) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 75ea81d55a4..98943ebda3f 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -8834,8 +8834,6 @@ start with default arguments, then refine the slowdown regions." (message "to %s:%6s,%7s" l delta tot)) tot)) -(defvar font-lock-cache-position) - (defun cperl-emulate-lazy-lock (&optional window-size) "Emulate `lazy-lock' without `condition-case', so `debug-on-error' works. Start fontifying the buffer from the start (or end) using the given diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index deccc75b156..815c7352281 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -159,7 +159,6 @@ ;; 3. Labels for "else" statements (F2003)? (defvar comment-auto-fill-only-comments) -(defvar font-lock-keywords) ;; User options diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 2d08714b7cf..a57a0c32ac7 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1141,7 +1141,6 @@ When DING is non-nil, ring the bell as well." (goto-char pos) (recenter 0))))) -(defvar font-lock-verbose) (defvar idlwave-mode-syntax-table) (defvar idlwave-font-lock-defaults) (defun idlwave-help-fontify () diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 7bdaa6b1b6f..3c00046a26a 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -5335,7 +5335,6 @@ directories and save the routine info. (idlwave-path-alist-remove-flag dir-entry 'user))) (idlwave-scan-user-lib-files path-alist))) -(defvar font-lock-mode) (defun idlwave-scan-user-lib-files (path-alist) ;; Scan the PRO files in PATH-ALIST and store the info in the user catalog (let* ((idlwave-scanning-lib t) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index cfc10878922..ed4ea8e3618 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,7 +1,6 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 1993-1997, 1999, 2001-2023 Free Software Foundation, -;; Inc. +;; Copyright (C) 1993-2023 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Old-Version: 2.0f @@ -158,10 +157,6 @@ (autoload 'shell-command-completion "shell") (autoload 'shell-environment-variable-completion "shell") -(defvar font-lock-comment-face) -(defvar font-lock-set-defaults) -(defvar font-lock-string-face) - (defgroup sh nil "Shell programming utilities." diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 25eaab060c5..004ae50ef50 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -235,10 +235,6 @@ (require 'view) (eval-when-compile (require 'subr-x)) ; string-empty-p -(defvar font-lock-keyword-face) -(defvar font-lock-set-defaults) -(defvar font-lock-string-face) - ;;; Allow customization (defgroup SQL nil diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index d0a44eca17c..64cf3fa4bbb 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -781,7 +781,6 @@ When called with 2 \\[universal-argument] prefix args, disable magic word recogn (funcall errorf "Label %s not found" label)) found))) -(defvar font-lock-mode) (defun reftex-show-entry (beg-hlt end-hlt) ;; Show entry if point is hidden (let* ((n (/ (window-height) 2)) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 22efb527740..ae3ae1a198d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -250,9 +250,6 @@ on the menu bar. (defvar LaTeX-label-function) (defvar tex-main-file) (defvar outline-minor-mode) -(defvar font-lock-mode) -(defvar font-lock-keywords) -(defvar font-lock-fontify-region-function) ;;; ========================================================================= ;;; @@ -2035,7 +2032,6 @@ IGNORE-WORDS List of words which should be removed from the string." ;; Test of we use the font-lock version of x-symbol (and (featurep 'x-symbol-tex) (not (boundp 'x-symbol-mode))))))) -(defvar font-lock-defaults-computed) (defun reftex-fontify-select-label-buffer (parent-buffer) ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to ;; start with none-SPC char, because Font-Lock otherwise refuses operation. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 294c9792f39..41c4a6a1373 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,7 +1,6 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- lexical-binding:t -*- -;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2023 Free -;; Software Foundation, Inc. +;; Copyright (C) 1985-2023 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: tex @@ -33,9 +32,6 @@ (require 'cl-lib) (require 'skeleton)) -(defvar font-lock-comment-face) -(defvar font-lock-doc-face) - (require 'shell) (require 'compile) diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index 30296573796..7532a059d3b 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el @@ -352,7 +352,6 @@ the list is a three-string list TAG, KIND, REV." (delete-region pt (point))) tags))) -(defvar font-lock-mode) ;; (defun cvs-refontify (beg end) ;; (when font-lock-mode ;; (font-lock-fontify-region (1- beg) (1+ end)))) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c39a9cc2f22..7847a6c7670 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -255,10 +255,6 @@ Can be nil if the style is undecided, or else: - `diff3-E' - `diff3-A'") -;; Compiler pacifiers -(defvar font-lock-mode) -(defvar font-lock-keywords) - ;;;; ;;;; Actual code ;;;; diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a7763360795..c689eec444b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1631,7 +1631,6 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." map)) (defvar vc-git--log-view-long-font-lock-keywords nil) -(defvar font-lock-keywords) (defvar vc-git-region-history-font-lock-keywords '((vc-git-region-history-font-lock))) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 182d76882bb..b62420393aa 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -497,7 +497,6 @@ This requires hg 4.4 or later, for the \"-L\" option of \"hg log\"." map)) (defvar vc-hg--log-view-long-font-lock-keywords nil) -(defvar font-lock-keywords) (defvar vc-hg-region-history-font-lock-keywords '((vc-hg-region-history-font-lock))) diff --git a/lisp/woman.el b/lisp/woman.el index e4e3d176d08..e0af72b2b66 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2081,8 +2081,6 @@ European characters." ;;; The main decoding driver: -(defvar font-lock-mode) ; for the compiler - (defun woman-decode-buffer () "Decode a buffer in UN*X man-page source format. No external programs are used." -- 2.39.5