From: Nick Roberts <nickrob@snap.net.nz>
Date: Sun, 8 Jul 2007 06:51:48 +0000 (+0000)
Subject: (cvs-reread-cvsrc, cvs-header-msg, cvs-checkout)
X-Git-Tag: emacs-pretest-22.1.90~1297
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24086dddf039f2c6e83fdb93f0ee76f8d6efbbc5;p=emacs.git

(cvs-reread-cvsrc, cvs-header-msg, cvs-checkout)
(cvs-mode-checkout, cvs-execute-single-file): Use new function names
strings->string and string->strings.
---

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index eb6e88e7f2f..006b2cd905b 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 (cvs-string->strings (or (match-string 2) ""))))
+		   (val (string->strings (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
@@ -607,7 +607,7 @@ If non-nil, NEW means to create a new buffer no matter what."
 			  (t arg)))
 		       args)))
     (concat cvs-program " "
-	    (cvs-strings->string
+	    (strings->string
 	     (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery)
 		     (if cvs-cvsroot (list "-d" cvs-cvsroot))
 		     args
@@ -936,7 +936,7 @@ 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 (cvs-string->strings (read-string "Module(s): " (cvs-get-module)))
+     (list (string->strings (read-string "Module(s): " (cvs-get-module)))
 	   (read-directory-name "CVS Checkout Directory: "
 				nil default-directory nil)
 	   (cvs-add-branch-prefix
@@ -959,7 +959,7 @@ The files are stored to DIR."
 			 (if branch (format " (branch: %s)" branch)
 			   ""))))
      (list (read-directory-name prompt nil default-directory nil))))
-  (let ((modules (cvs-string->strings (cvs-get-module)))
+  (let ((modules (string->strings (cvs-get-module)))
 	(flags (cvs-add-branch-prefix
 		(cvs-flags-query 'cvs-checkout-flags "cvs checkout flags")))
 	(cvs-cvsroot (cvs-get-cvsroot)))
@@ -2244,7 +2244,7 @@ With prefix argument, prompt for cvs flags."
       (let* ((args (append constant-args arg-list)))
 
 	(insert (format "=== %s %s\n\n"
-			program (cvs-strings->string args)))
+			program (strings->string args)))
 
 	;; FIXME: return the exit status?
 	(apply 'call-process program nil t t args)