From b6238a26c97341cf2c34c12cf25c580f64d06a78 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 25 Jun 2022 00:19:23 +0200
Subject: [PATCH] Revert "Fix some byte-compilation warnings about subr-x"

This reverts commit cd479aa8bd498da4d7980a7fe7a37e238761482f.

This led to build failures when doing bootstraps.
---
 lisp/files.el                | 3 +--
 lisp/isearch.el              | 1 -
 lisp/progmodes/elisp-mode.el | 1 -
 lisp/replace.el              | 1 -
 lisp/term/haiku-win.el       | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index c205407f998..a804f0088ee 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -30,8 +30,7 @@
 
 (eval-when-compile
   (require 'pcase)
-  (require 'easy-mmode) ; For `define-minor-mode'.
-  (require 'subr-x))
+  (require 'easy-mmode)) ; For `define-minor-mode'.
 
 (defvar font-lock-keywords)
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0624858993d..7650ebcfcea 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -54,7 +54,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
-(eval-when-compile (require 'subr-x))
 
 ;; Some additional options and constants.
 
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index fc257679340..332488e6d41 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -31,7 +31,6 @@
 (require 'cl-generic)
 (require 'lisp-mode)
 (eval-when-compile (require 'cl-lib))
-(eval-when-compile (require 'subr-x))
 
 (define-abbrev-table 'emacs-lisp-mode-abbrev-table ()
   "Abbrev table for Emacs Lisp mode.
diff --git a/lisp/replace.el b/lisp/replace.el
index 34c3d5299e4..c5c24c7a365 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -30,7 +30,6 @@
 
 (require 'text-mode)
 (eval-when-compile (require 'cl-lib))
-(eval-when-compile (require 'subr-x))
 
 (defcustom case-replace t
   "Non-nil means `query-replace' should preserve case in replacements."
diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index 024459e6475..5443904a733 100644
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -24,7 +24,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
-(eval-when-compile (require 'subr-x))
 (unless (featurep 'haiku)
   (error "%s: Loading haiku-win without having Haiku"
          invocation-name))
-- 
2.39.5