master 2f346b0ab1: Re-fix build warnings about subr-x defsubsts

[Lars Ingebrigtsen]

branch: master
commit 2f346b0ab10a8777ff5629af30a224b4f0ea16a6
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Re-fix build warnings about subr-x defsubsts
    
    * lisp/term/haiku-win.el (require):
    * lisp/progmodes/elisp-mode.el (require):
    * lisp/isearch.el (require): Require subr-x at compile time, since
    these use defsubsts/macros from there.
    
    * lisp/emacs-lisp/subr-x.el (string-empty-p): Move from here...
    * lisp/simple.el (string-empty-p): ... to here.  This is to help
    with a build problem where files.el is using the defsubst, but
    requiring subr-x.el at compile time leads to load errors.
---
 lisp/emacs-lisp/subr-x.el    | 4 ----
 lisp/isearch.el              | 1 +
 lisp/progmodes/elisp-mode.el | 1 +
 lisp/simple.el               | 4 ++++
 lisp/term/haiku-win.el       | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index b0de5d155a..390e505f00 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -97,10 +97,6 @@ threading."
     (maphash (lambda (_ v) (push v values)) hash-table)
     values))
 
-(defsubst string-empty-p (string)
-  "Check whether STRING is empty."
-  (string= string ""))
-
 (defsubst string-join (strings &optional separator)
   "Join all STRINGS using SEPARATOR.
 Optional argument SEPARATOR must be a string, a vector, or a list of
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7650ebcfce..0624858993 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -54,6 +54,7 @@
 ;;; 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 332488e6d4..fc25767934 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -31,6 +31,7 @@
 (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/simple.el b/lisp/simple.el
index 8f82ff3a8e..2b11a6362f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10620,6 +10620,10 @@ If the buffer doesn't exist, create it first."
           (save-buffer)))
       t)))
 
+(defsubst string-empty-p (string)
+  "Check whether STRING is empty."
+  (string= string ""))
+
 
 
 (provide 'simple)
diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index 5443904a73..024459e647 100644
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -24,6 +24,7 @@
 ;;; 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))