From ef6132c55fc3174f67766ad92e5e2866ac92b8ff Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sun, 12 Feb 2017 19:02:56 -0800
Subject: [PATCH] Fix recent bootstrap issue by moving string-to-list

* lisp/international/mule-util.el (string-to-list, string-to-vector):
Move from here...
* lisp/subr.el (string-to-list, string-to-vector): ...to here.
The implementation is trivial and at least string-to-list
has ended up being needed early during bootstrap.
---
 lisp/international/mule-util.el | 10 ----------
 lisp/subr.el                    |  8 ++++++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 06b63eae370..92a658655ac 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -33,16 +33,6 @@
 ;;; String manipulations while paying attention to multibyte characters.
 
 ;;;###autoload
-(defsubst string-to-list (string)
-  "Return a list of characters in STRING."
-  (append string nil))
-
-;;;###autoload
-(defsubst string-to-vector (string)
-  "Return a vector of characters in STRING."
-  (vconcat string))
-
-;;;###autoload
 (defun store-substring (string idx obj)
   "Embed OBJ (string or character) at index IDX of STRING."
   (if (integerp obj)
diff --git a/lisp/subr.el b/lisp/subr.el
index a204577ddf9..4f848d1400c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2875,6 +2875,14 @@ See Info node `(elisp)Security Considerations'."
        (replace-regexp-in-string "[^-0-9a-zA-Z_./\n]" "\\\\\\&" argument))))
    ))
 
+(defsubst string-to-list (string)
+  "Return a list of characters in STRING."
+  (append string nil))
+
+(defsubst string-to-vector (string)
+  "Return a vector of characters in STRING."
+  (vconcat string))
+
 (defun string-or-null-p (object)
   "Return t if OBJECT is a string or nil.
 Otherwise, return nil."
-- 
2.11.4.GIT