(cvs-reread-cvsrc, cvs-checkout, cvs-mode-checkout)

(cvs-execute-single-file): Use new name split-string-and-unquote.
(cvs-header-msg): Use new name combine-and-quote-strings.

3 files changed, 29 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index a428a39f421..8e4d7f95f1c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -81,6 +81,9 @@ as its frame.
 ** The new function `image-refresh' refreshes all images associated
 with a given image specification.
 
+** The new function `split-string-and-unquote' does (what?)
+
+** The new function `combine-and-quote-strings' does (what?)
 
 * Installation Changes in Emacs 22.1
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 713ad4d3bf6..cba37b26f2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2007-08-12  Richard Stallman  <rms@gnu.org>
+
+        * pcvs.el (cvs-reread-cvsrc, cvs-checkout, cvs-mode-checkout)
+        (cvs-execute-single-file): Use new name split-string-and-unquote.
+        (cvs-header-msg): Use new name combine-and-quote-strings.
+
+        * emulation/vi.el (vi-next-line): Ignore return value of line-move.
+
+        * progmodes/gud.el (gud-common-init): Use new name
+        split-string-and-unquote.
+
+        * progmodes/flymake.el (flymake-err-line-patterns): Fix infloop
+        in javac regexp.
+
+        * pcvs-util.el (cvs-qtypedesc-strings): Use new names
+        combine-and-quote-strings and split-string-and-unquote.
+
+        * subr.el (combine-and-quote-strings): Renamed from strings->string.
+        (split-string-and-unquote): Renamed from string->strings.
+
 2007-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * log-view.el (log-view-font-lock-keywords): Use `eval' so as to adapt
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 901110bbfa3..6db3ed31a51 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -182,7 +182,7 @@
           (when (re-search-forward
                  (concat "^" cmd "\\(\\s-+\\(.*\\)\\)?$") nil t)
             (let* ((sym (intern (concat "cvs-" cmd "-flags")))
-                   (val (string->strings (or (match-string 2) ""))))
+                   (val (split-string-and-unquote (or (match-string 2) ""))))
               (cvs-flags-set sym 0 val))))
         ;; ensure that cvs doesn't have -q or -Q
         (cvs-flags-set 'cvs-cvs-flags 0
@@ -612,7 +612,7 @@ If non-nil, NEW means to create a new buffer no matter what."
                           (t arg)))
                        args)))
     (concat cvs-program " "
-            (strings->string
+            (combine-and-quote-strings
              (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery)
                      (if cvs-cvsroot (list "-d" cvs-cvsroot))
                      args
@@ -941,7 +941,8 @@ With a prefix argument, prompt for cvs FLAGS to use."
    (let ((root (cvs-get-cvsroot)))
      (if (or (null root) current-prefix-arg)
          (setq root (read-string "CVS Root: ")))
-     (list (string->strings (read-string "Module(s): " (cvs-get-module)))
+     (list (split-string-and-unquote
+            (read-string "Module(s): " (cvs-get-module)))
            (read-directory-name "CVS Checkout Directory: "
                                 nil default-directory nil)
            (cvs-add-branch-prefix
@@ -964,7 +965,7 @@ The files are stored to DIR."
                          (if branch (format " (branch: %s)" branch)
                            ""))))
      (list (read-directory-name prompt nil default-directory nil))))
-  (let ((modules (string->strings (cvs-get-module)))
+  (let ((modules (split-string-and-unquote (cvs-get-module)))
         (flags (cvs-add-branch-prefix
                 (cvs-flags-query 'cvs-checkout-flags "cvs checkout flags")))
         (cvs-cvsroot (cvs-get-cvsroot)))
@@ -2253,7 +2254,7 @@ With prefix argument, prompt for cvs flags."
       (let* ((args (append constant-args arg-list)))
 
         (insert (format "=== %s %s\n\n"
-                        program (strings->string args)))
+                        program (split-string-and-unquote args)))
 
         ;; FIXME: return the exit status?
         (apply 'call-process program nil t t args)