From c68c5fbe14657060381bc6069b7d5a2be3ee4fea Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Mon, 5 Jan 2026 02:55:13 +0900 Subject: [PATCH] ; Remove redundant cl-lib runtime dependencies across lisp/ * lisp/editorconfig-tools.el: * lisp/emacs-lisp/shorthands.el: * lisp/info-xref.el: * lisp/international/quail.el: * lisp/international/rfc1843.el: * lisp/mail/ietf-drums.el: * lisp/mail/rfc2047.el: * lisp/mail/yenc.el: * lisp/net/pop3.el: * lisp/net/sasl-scram-sha256.el: * lisp/net/shr-color.el: * lisp/progmodes/grep.el: * lisp/scroll-bar.el: * lisp/textmodes/emacs-news-mode.el: * lisp/textmodes/reftex-auc.el: * lisp/textmodes/reftex-dcr.el: * lisp/textmodes/reftex-global.el: * lisp/textmodes/reftex-sel.el: * lisp/url/url-dav.el: * lisp/vc/vc-src.el: * lisp/xwidget.el: * lisp/yank-media.el: Remove redundant (require 'cl-lib). (Bug#80129) --- lisp/editorconfig-tools.el | 3 --- lisp/emacs-lisp/shorthands.el | 1 - lisp/info-xref.el | 1 - lisp/international/quail.el | 1 - lisp/international/rfc1843.el | 2 -- lisp/mail/ietf-drums.el | 2 -- lisp/mail/rfc2047.el | 1 - lisp/mail/yenc.el | 2 -- lisp/net/pop3.el | 2 -- lisp/net/sasl-scram-sha256.el | 1 - lisp/net/shr-color.el | 1 - lisp/progmodes/grep.el | 1 - lisp/scroll-bar.el | 1 - lisp/textmodes/emacs-news-mode.el | 1 - lisp/textmodes/reftex-auc.el | 2 -- lisp/textmodes/reftex-dcr.el | 2 -- lisp/textmodes/reftex-global.el | 1 - lisp/textmodes/reftex-sel.el | 2 -- lisp/url/url-dav.el | 2 -- lisp/vc/vc-src.el | 1 - lisp/xwidget.el | 1 - lisp/yank-media.el | 1 - 22 files changed, 32 deletions(-) diff --git a/lisp/editorconfig-tools.el b/lisp/editorconfig-tools.el index 4c687fbb570..ae793bff87a 100644 --- a/lisp/editorconfig-tools.el +++ b/lisp/editorconfig-tools.el @@ -31,12 +31,9 @@ ;;; Code: -(require 'cl-lib) - (eval-when-compile (require 'subr-x)) - (require 'editorconfig) ;;;###autoload diff --git a/lisp/emacs-lisp/shorthands.el b/lisp/emacs-lisp/shorthands.el index 11f9175e468..9c668bb3720 100644 --- a/lisp/emacs-lisp/shorthands.el +++ b/lisp/emacs-lisp/shorthands.el @@ -28,7 +28,6 @@ ;;; Code: (require 'files) (require 'mule) -(eval-when-compile (require 'cl-lib)) (defun hack-read-symbol-shorthands () "Compute `read-symbol-shorthands' from Local Variables section." diff --git a/lisp/info-xref.el b/lisp/info-xref.el index e09c86ef811..df92c77c843 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -45,7 +45,6 @@ ;;; Code: (require 'info) -(eval-when-compile (require 'cl-lib)) ; for `cl-incf' (defgroup info-xref nil "Check external cross-references in Info documents." diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 7de35a3f5e4..eeea4574b42 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -53,7 +53,6 @@ ;;; Code: (require 'help-mode) -(eval-when-compile (require 'cl-lib)) (defgroup quail nil "Quail: multilingual input method." diff --git a/lisp/international/rfc1843.el b/lisp/international/rfc1843.el index c938b6cc31c..261e5e02f9e 100644 --- a/lisp/international/rfc1843.el +++ b/lisp/international/rfc1843.el @@ -30,8 +30,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (defvar rfc1843-word-regexp "~\\({\\([\041-\167][\041-\176]\\| \\)+\\)\\(~}\\|$\\)") diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el index 80949dff198..5ee822e2dec 100644 --- a/lisp/mail/ietf-drums.el +++ b/lisp/mail/ietf-drums.el @@ -27,8 +27,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (defvar ietf-drums-no-ws-ctl-token "\001-\010\013\014\016-\037\177" "US-ASCII control characters excluding CR, LF and white space.") (defvar ietf-drums-text-token "\001-\011\013\014\016-\177" diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el index 089875209e9..a48b876443b 100644 --- a/lisp/mail/rfc2047.el +++ b/lisp/mail/rfc2047.el @@ -26,7 +26,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) (defvar message-posting-charset) (require 'mm-util) diff --git a/lisp/mail/yenc.el b/lisp/mail/yenc.el index fe3315a226f..88e56c7dc67 100644 --- a/lisp/mail/yenc.el +++ b/lisp/mail/yenc.el @@ -32,8 +32,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (defconst yenc-begin-line "^=ybegin.*$") diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el index 7d8442c64d2..246528a7176 100644 --- a/lisp/net/pop3.el +++ b/lisp/net/pop3.el @@ -34,8 +34,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (require 'mail-utils) (defgroup pop3 nil diff --git a/lisp/net/sasl-scram-sha256.el b/lisp/net/sasl-scram-sha256.el index 4df500092b6..844425bdb43 100644 --- a/lisp/net/sasl-scram-sha256.el +++ b/lisp/net/sasl-scram-sha256.el @@ -26,7 +26,6 @@ ;;; Code: -(require 'cl-lib) (require 'sasl) (require 'hex-util) (require 'rfc2104) diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el index 45f600a480d..68bf2c418ec 100644 --- a/lisp/net/shr-color.el +++ b/lisp/net/shr-color.el @@ -27,7 +27,6 @@ ;;; Code: (require 'color) -(eval-when-compile (require 'cl-lib)) (defgroup shr-color nil "Simple HTML Renderer colors." diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index a14bd9e357b..e0552b3a7b2 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -29,7 +29,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) (require 'compile) (defgroup grep nil diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 09195ae6598..b9d1d3a441e 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -29,7 +29,6 @@ ;;; Code: (require 'mouse) -(eval-when-compile (require 'cl-lib)) ;;;; Utilities. diff --git a/lisp/textmodes/emacs-news-mode.el b/lisp/textmodes/emacs-news-mode.el index 12687ff325e..511e6f4a669 100644 --- a/lisp/textmodes/emacs-news-mode.el +++ b/lisp/textmodes/emacs-news-mode.el @@ -23,7 +23,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) (require 'outline) (require 'subr-x) ; `emacs-etc--hide-local-variables' diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 3f7709e1497..0396c3bcd8f 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -24,8 +24,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (require 'reftex) (declare-function TeX-argument-prompt "ext:tex" diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 3d49e2f2410..b2e1bb61ddb 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -24,8 +24,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (declare-function bibtex-beginning-of-entry "bibtex" ()) (require 'reftex) diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index 890bd9551c7..e9acf91c824 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -24,7 +24,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) (provide 'reftex-global) (require 'reftex) diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index dd119ae341b..f75b15c6eb9 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -24,8 +24,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (require 'reftex) ;; Common bindings in reftex-select-label-mode-map diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 5c052ad92fe..275555b4838 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -27,8 +27,6 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) - (require 'xml) (require 'url-util) (require 'url-handlers) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index fa664e51220..c43b37627fb 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -82,7 +82,6 @@ ;;; (eval-when-compile - (require 'cl-lib) (require 'vc)) (declare-function vc-setup-buffer "vc-dispatcher" (buf)) diff --git a/lisp/xwidget.el b/lisp/xwidget.el index d8aac1250c4..c75cd047495 100644 --- a/lisp/xwidget.el +++ b/lisp/xwidget.el @@ -31,7 +31,6 @@ ;; And is pointless when we do, since it's in C and so preloaded. ;;(require 'xwidget-internal) -(require 'cl-lib) (require 'bookmark) (require 'format-spec) diff --git a/lisp/yank-media.el b/lisp/yank-media.el index 8c55ee3da9f..f01d5ba7d59 100644 --- a/lisp/yank-media.el +++ b/lisp/yank-media.el @@ -24,7 +24,6 @@ ;;; Code: -(require 'cl-lib) (require 'seq) (defvar yank-media--registered-handlers nil)