* pcvs-util.el (cvs-strings->string, cvs-string->strings):

Rename and move to...

* subr.el (strings->string, string->strings): ...here.

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 3945d7ba67c627ad78350a0d08443fb1b12a2bd8..58c605a19d25239d9b149fd4d2d571ab10e83153 100644 (file)
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -186,35 +186,6 @@ arguments.  If ARGS is not a list, no argument will be passed."
   "Tell whether STR1 is a prefix of STR2."
   (eq t (compare-strings str2 nil (length str1) str1 nil nil)))
 
-;; (string->strings (strings->string X)) == X
-(defun cvs-strings->string (strings &optional separator)
-  "Concatenate the STRINGS, adding the SEPARATOR (default \" \").
-This tries to quote the strings to avoid ambiguity such that
-  (cvs-string->strings (cvs-strings->string strs)) == strs
-Only some SEPARATORs will work properly."
-  (let ((sep (or separator " ")))
-    (mapconcat
-     (lambda (str)
-       (if (string-match "[\\\"]" str)
-          (concat "\"" (replace-regexp-in-string "[\\\"]" "\\\\\\&" str) "\"")
-        str))
-     strings sep)))
-
-;; (string->strings (strings->string X)) == X
-(defun cvs-string->strings (string &optional separator)
-  "Split the STRING into a list of strings.
-It understands elisp style quoting within STRING such that
-  (cvs-string->strings (cvs-strings->string strs)) == strs
-The SEPARATOR regexp defaults to \"\\s-+\"."
-  (let ((sep (or separator "\\s-+"))
-       (i (string-match "[\"]" string)))
-    (if (null i) (split-string string sep t)   ; no quoting:  easy
-      (append (unless (eq i 0) (split-string (substring string 0 i) sep t))
-             (let ((rfs (read-from-string string i)))
-               (cons (car rfs)
-                     (cvs-string->strings (substring string (cdr rfs))
-                                          sep)))))))
-
 ;;;;
 ;;;; file names
 ;;;;
@@ -240,7 +211,7 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
 (defconst cvs-qtypedesc-string1 (cvs-qtypedesc-create 'identity 'identity t))
 (defconst cvs-qtypedesc-string (cvs-qtypedesc-create 'identity 'identity))
 (defconst cvs-qtypedesc-strings
-  (cvs-qtypedesc-create 'cvs-string->strings 'cvs-strings->string nil))
+  (cvs-qtypedesc-create 'string->strings 'strings->string nil))
 
 (defun cvs-query-read (default prompt qtypedesc &optional hist-sym)
   (let* ((qtypedesc (or qtypedesc cvs-qtypedesc-strings))

diff --git a/lisp/subr.el b/lisp/subr.el
index a05c1d1578002f60d6fd6d754c5ab5f942f9f59b..9ce4758a7468bf705f8c90bcb1b0772d3772c430 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2759,6 +2759,36 @@ Modifies the match data; use `save-match-data' if necessary."
              (cons (substring string start)
                    list)))
     (nreverse list)))
+
+;; (string->strings (strings->string X)) == X
+(defun strings->string (strings &optional separator)
+  "Concatenate the STRINGS, adding the SEPARATOR (default \" \").
+This tries to quote the strings to avoid ambiguity such that
+  (string->strings (strings->string strs)) == strs
+Only some SEPARATORs will work properly."
+  (let ((sep (or separator " ")))
+    (mapconcat
+     (lambda (str)
+       (if (string-match "[\\\"]" str)
+          (concat "\"" (replace-regexp-in-string "[\\\"]" "\\\\\\&" str) "\"")
+        str))
+     strings sep)))
+
+;; (string->strings (strings->string X)) == X
+(defun string->strings (string &optional separator)
+  "Split the STRING into a list of strings.
+It understands elisp style quoting within STRING such that
+  (string->strings (strings->string strs)) == strs
+The SEPARATOR regexp defaults to \"\\s-+\"."
+  (let ((sep (or separator "\\s-+"))
+       (i (string-match "[\"]" string)))
+    (if (null i) (split-string string sep t)   ; no quoting:  easy
+      (append (unless (eq i 0) (split-string (substring string 0 i) sep t))
+             (let ((rfs (read-from-string string i)))
+               (cons (car rfs)
+                     (string->strings (substring string (cdr rfs))
+                                          sep)))))))
+
 \f
 ;;;; Replacement in strings.