diff options
| -rw-r--r-- | lisp/pcvs.el | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
| 182 | (when (re-search-forward | 182 | (when (re-search-forward |
| 183 | (concat "^" cmd "\\(\\s-+\\(.*\\)\\)?$") nil t) | 183 | (concat "^" cmd "\\(\\s-+\\(.*\\)\\)?$") nil t) |
| 184 | (let* ((sym (intern (concat "cvs-" cmd "-flags"))) | 184 | (let* ((sym (intern (concat "cvs-" cmd "-flags"))) |
| 185 | (val (cvs-string->strings (or (match-string 2) "")))) | 185 | (val (string->strings (or (match-string 2) "")))) |
| 186 | (cvs-flags-set sym 0 val)))) | 186 | (cvs-flags-set sym 0 val)))) |
| 187 | ;; ensure that cvs doesn't have -q or -Q | 187 | ;; ensure that cvs doesn't have -q or -Q |
| 188 | (cvs-flags-set 'cvs-cvs-flags 0 | 188 | (cvs-flags-set 'cvs-cvs-flags 0 |
| @@ -607,7 +607,7 @@ If non-nil, NEW means to create a new buffer no matter what." | |||
| 607 | (t arg))) | 607 | (t arg))) |
| 608 | args))) | 608 | args))) |
| 609 | (concat cvs-program " " | 609 | (concat cvs-program " " |
| 610 | (cvs-strings->string | 610 | (strings->string |
| 611 | (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery) | 611 | (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery) |
| 612 | (if cvs-cvsroot (list "-d" cvs-cvsroot)) | 612 | (if cvs-cvsroot (list "-d" cvs-cvsroot)) |
| 613 | args | 613 | args |
| @@ -936,7 +936,7 @@ With a prefix argument, prompt for cvs FLAGS to use." | |||
| 936 | (let ((root (cvs-get-cvsroot))) | 936 | (let ((root (cvs-get-cvsroot))) |
| 937 | (if (or (null root) current-prefix-arg) | 937 | (if (or (null root) current-prefix-arg) |
| 938 | (setq root (read-string "CVS Root: "))) | 938 | (setq root (read-string "CVS Root: "))) |
| 939 | (list (cvs-string->strings (read-string "Module(s): " (cvs-get-module))) | 939 | (list (string->strings (read-string "Module(s): " (cvs-get-module))) |
| 940 | (read-directory-name "CVS Checkout Directory: " | 940 | (read-directory-name "CVS Checkout Directory: " |
| 941 | nil default-directory nil) | 941 | nil default-directory nil) |
| 942 | (cvs-add-branch-prefix | 942 | (cvs-add-branch-prefix |
| @@ -959,7 +959,7 @@ The files are stored to DIR." | |||
| 959 | (if branch (format " (branch: %s)" branch) | 959 | (if branch (format " (branch: %s)" branch) |
| 960 | "")))) | 960 | "")))) |
| 961 | (list (read-directory-name prompt nil default-directory nil)))) | 961 | (list (read-directory-name prompt nil default-directory nil)))) |
| 962 | (let ((modules (cvs-string->strings (cvs-get-module))) | 962 | (let ((modules (string->strings (cvs-get-module))) |
| 963 | (flags (cvs-add-branch-prefix | 963 | (flags (cvs-add-branch-prefix |
| 964 | (cvs-flags-query 'cvs-checkout-flags "cvs checkout flags"))) | 964 | (cvs-flags-query 'cvs-checkout-flags "cvs checkout flags"))) |
| 965 | (cvs-cvsroot (cvs-get-cvsroot))) | 965 | (cvs-cvsroot (cvs-get-cvsroot))) |
| @@ -2244,7 +2244,7 @@ With prefix argument, prompt for cvs flags." | |||
| 2244 | (let* ((args (append constant-args arg-list))) | 2244 | (let* ((args (append constant-args arg-list))) |
| 2245 | 2245 | ||
| 2246 | (insert (format "=== %s %s\n\n" | 2246 | (insert (format "=== %s %s\n\n" |
| 2247 | program (cvs-strings->string args))) | 2247 | program (strings->string args))) |
| 2248 | 2248 | ||
| 2249 | ;; FIXME: return the exit status? | 2249 | ;; FIXME: return the exit status? |
| 2250 | (apply 'call-process program nil t t args) | 2250 | (apply 'call-process program nil t t args) |