From 7d8c433264b5d72624acc6b4cebc7620040730d3 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 19 Jul 2007 14:26:08 +0000 Subject: [PATCH] vc-cvs-checkin had some reference problems, now fixed. --- lisp/vc-cvs.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index fab59b1710c..588ff4be6ba 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -342,7 +342,8 @@ its parents." ;; Check checkin problem. (cond ((re-search-forward "Up-to-date check failed" nil t) - (vc-file-setprop file 'vc-state 'needs-merge) + (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) + files) (error (substitute-command-keys (concat "Up-to-date check failed: " "type \\[vc-next-action] to merge in changes")))) -- 2.39.2