Commits

gregk  committed 3299b52

fix parsing bug in cvs-update-stdout-parse-table: COLLECT evals
only a single form, it is not an implicit progn.

  • Participants
  • Parent commits 4404cc8
  • Branches r1-31-devel

Comments (0)

Files changed (2)

 	(cvs-shell-c-flag): new variable.
 	(run-cvs-process): use it.
 	(cvs-shell-c-flag): remove, use shell-command-switch instead.
+	(cvs-update-stdout-parse-table): fix parsing bug: COLLECT evals
+	only a single form, it is not an implicit progn.
 
 	* pcl-cvs.texi: more cleanup.
 
         (REGEXP "Merging differences between [0-9.]+ and [0-9.]+ into \\(.*\\)$"
                 1) ; Extract filename here.
         (COLLECT
-         (setq *current-file* (car (car *match-list*)))
          (let ((filename (car (car *match-list*)))
                (base-revision (car (car (cdr (cdr *match-list*)))))
                (head-revision (car (car (cdr *match-list*)))))
-	  
+           (setq *current-file* (car (car *match-list*)))
            (if (looking-at (concat "^[CM] \\(.*" (regexp-quote filename) "\\)$"))
                (let ((full-path (concat (file-name-as-directory *root-dir*)
                                         (match-string 1))))