From 4594d6f59a0f0c229ded9874a38ae5acf9fe5647 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 3 Dec 2020 09:50:58 +0100
Subject: [PATCH] Remove redundant requires of 'custom'

* lisp/emacs-lisp/eieio-custom.el:
* lisp/htmlfontify.el:
* lisp/mwheel.el:
* lisp/net/eudc-vars.el:
* lisp/net/ldap.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-gvfs.el:
* lisp/progmodes/cwarn.el:
* lisp/progmodes/sql.el:
* lisp/savehist.el:
* lisp/textmodes/reftex.el:
* lisp/wid-browse.el: Don't require 'custom'; it is preloaded since
version 20.1.
---
 lisp/emacs-lisp/eieio-custom.el | 1 -
 lisp/htmlfontify.el             | 2 --
 lisp/mwheel.el                  | 1 -
 lisp/net/eudc-vars.el           | 2 --
 lisp/net/ldap.el                | 1 -
 lisp/net/tramp-ftp.el           | 1 -
 lisp/net/tramp-gvfs.el          | 2 --
 lisp/progmodes/cwarn.el         | 1 -
 lisp/progmodes/sql.el           | 1 -
 lisp/savehist.el                | 2 --
 lisp/textmodes/reftex.el        | 4 ----
 lisp/wid-browse.el              | 1 -
 12 files changed, 19 deletions(-)

diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index e26dc9e9a9c..3a9d8672e46 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -33,7 +33,6 @@
 (require 'eieio)
 (require 'widget)
 (require 'wid-edit)
-(require 'custom)
 
 ;;; Compatibility
 
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 4977e08c3da..c9ede657f54 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -78,8 +78,6 @@
 
 ;;; Code:
 (eval-when-compile (require 'cl-lib))
-(require 'custom)
-;;  (`defgroup' `defcustom')
 (require 'cus-edit)
 
 (require 'htmlfontify-loaddefs)
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 1d9fe68075b..9fd050fea58 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -37,7 +37,6 @@
 ;; 'mwheel-down', but I cannot find a way to do this very easily (or
 ;; portably), so for now I just live with it.
 
-(require 'custom)
 (require 'timer)
 
 (defvar mouse-wheel-mode)
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index bb1474b8b5b..2306d7b99a4 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -27,8 +27,6 @@
 
 ;;; Code:
 
-(require 'custom)
-
 ;;{{{      EUDC Main Custom Group
 
 (defgroup eudc nil
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 5639d52f815..0016af292ef 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -33,7 +33,6 @@
 
 ;;; Code:
 
-(require 'custom)
 (require 'password-cache)
 
 (autoload 'auth-source-search "auth-source")
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 996a92454f1..329a490c7ae 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -31,7 +31,6 @@
 (require 'tramp)
 
 ;; Pacify byte-compiler.
-(eval-when-compile (require 'custom))
 (defvar ange-ftp-ftp-name-arg)
 (defvar ange-ftp-ftp-name-res)
 (defvar ange-ftp-name-format)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 7970488b40d..f3d03d0fb0a 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -108,8 +108,6 @@
 (require 'url-util)
 
 ;; Pacify byte-compiler.
-(eval-when-compile (require 'custom))
-
 (declare-function zeroconf-init "zeroconf")
 (declare-function zeroconf-list-service-types "zeroconf")
 (declare-function zeroconf-list-services "zeroconf")
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 0571739344e..b09a2ed7865 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -104,7 +104,6 @@
 
 ;;{{{ Dependencies
 
-(require 'custom)
 (require 'cc-mode)
 
 ;;}}}
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 22099394ff0..0bf9a517aa6 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -232,7 +232,6 @@
 
 (require 'cl-lib)
 (require 'comint)
-(require 'custom)
 (require 'thingatpt)
 (require 'view)
 (eval-when-compile (require 'subr-x))   ; string-empty-p
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 5d20239d17f..8931e83243d 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -47,8 +47,6 @@
 
 ;;; Code:
 
-(require 'custom)
-
 ;; User variables
 
 (defgroup savehist nil
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 29ebab5f9bb..b1fa79ae2ac 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -51,10 +51,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
-
-;; Stuff that needs to be there when we use defcustom
-(require 'custom)
-
 (require 'easymenu)
 
 (defvar reftex-tables-dirty t
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index f5c3d486f4d..bc2e3c4c12b 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -28,7 +28,6 @@
 ;;; Code:
 
 (require 'easymenu)
-(require 'custom)
 (require 'wid-edit)
 
 (defgroup widget-browse nil
-- 
2.39.5