[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ef6132c: Fix recent bootstrap issue by moving strin
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master ef6132c: Fix recent bootstrap issue by moving string-to-list |
Date: |
Sun, 12 Feb 2017 22:03:44 -0500 (EST) |
branch: master
commit ef6132c55fc3174f67766ad92e5e2866ac92b8ff
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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 06b63ea..92a6586 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 a204577..4f848d1 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."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ef6132c: Fix recent bootstrap issue by moving string-to-list,
Glenn Morris <=