Mercurial > emacs

diff lisp/vc-cvs.el @ 91239:2fcaae6177a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
author Miles Bader <miles@gnu.org>
date Sun, 16 Dec 2007 05:08:49 +0000
parents 53108e6cea98 f358a2fd5895
children 56a72e2bd635
line wrap: on
line diff
--- a/lisp/vc-cvs.el	Fri Dec 14 12:53:04 2007 +0000
+++ b/lisp/vc-cvs.el	Sun Dec 16 05:08:49 2007 +0000
@@ -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