Revert "Fix some byte-compilation warnings about subr-x"

This reverts commit cd479aa8bd498da4d7980a7fe7a37e238761482f.

This led to build failures when doing bootstraps.

diff --git a/lisp/files.el b/lisp/files.el
index c205407f998592a9c446e31acf4a250ea251b3c9..a804f0088eebb8b408ab5205d279c9937d2be85a 100644 (file)
--- 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 0624858993d5e2bb225a6cde63e71ba70b4e30c5..7650ebcfcea20116d335b05c014a38a93127879f 100644 (file)
--- 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))
 \f
 ;; Some additional options and constants.
 

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index fc2576793402813d23d4edf6e867a793f5371b5d..332488e6d412c860a4d959c92d055092704021dd 100644 (file)
--- 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 34c3d5299e4bd0db209b166d8443d0cfe8bf5e43..c5c24c7a36580b7dda3dab97f256f2ebc9aaae52 100644 (file)
--- 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 024459e64754769517d2b378f530c9161b68c595..5443904a733bf2de4bee1c1eb8e73999d94ddea8 100644 (file)
--- 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))