[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v

[D. Goel]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     D. Goel <deego> 07/12/06 17:56:42

Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- vc-cvs.el   12 Nov 2007 03:56:37 -0000      1.94
+++ vc-cvs.el   6 Dec 2007 17:56:42 -0000       1.95
@@ -351,7 +351,7 @@
        ((re-search-forward "Up-to-date check failed" nil t)
        (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
              files)
-        (error (substitute-command-keys
+        (error "%s" (substitute-command-keys
                 (concat "Up-to-date check failed: "
                         "type \\[vc-next-action] to merge in changes"))))
        (t