aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2007-07-19 14:18:33 +0000
committerEric S. Raymond2007-07-19 14:18:33 +0000
commitea139d51c44bdab6a1a796c7866d01be090dfaef (patch)
tree058474d5dcdc783d760352f0185074aeb12d40e8
parent2c2cd782c8f5fe6a604d682b3b35b9ab5468d98f (diff)
downloademacs-ea139d51c44bdab6a1a796c7866d01be090dfaef.tar.gz
emacs-ea139d51c44bdab6a1a796c7866d01be090dfaef.zip
Fix two variable-reference bugs.
-rw-r--r--lisp/vc-cvs.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 3712dcd8999..fab59b1710c 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -330,8 +330,9 @@ its parents."
330 ;; as a branch, commit and switch to it. 330 ;; as a branch, commit and switch to it.
331 (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev)) 331 (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev))
332 (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev)) 332 (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev))
333 (vc-file-setprop file 'vc-cvs-sticky-tag rev))) 333 (mapc (lambda (file) (vc-file-setprop file 'vc-cvs-sticky-tag rev))
334 (let ((status (apply 'vc-cvs-command nil 1 file 334 files)))
335 (let ((status (apply 'vc-cvs-command nil 1 files
335 "ci" (if rev (concat "-r" rev)) 336 "ci" (if rev (concat "-r" rev))
336 (concat "-m" comment) 337 (concat "-m" comment)
337 (vc-switches 'CVS 'checkin)))) 338 (vc-switches 'CVS 'checkin))))
@@ -509,7 +510,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
509 (fboundp 'start-process))) 510 (fboundp 'start-process)))
510 (status (apply 'vc-cvs-command (or buffer "*vc-diff*") 511 (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
511 (if async 'async 1) 512 (if async 'async 1)
512 file "diff" 513 files "diff"
513 (and oldvers (concat "-r" oldvers)) 514 (and oldvers (concat "-r" oldvers))
514 (and newvers (concat "-r" newvers)) 515 (and newvers (concat "-r" newvers))
515 (vc-switches 'CVS 'diff)))) 516 (vc-switches 'CVS 'diff))))