[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el,v
From: |
D. Goel |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el,v |
Date: |
Thu, 06 Dec 2007 17:56:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: D. Goel <deego> 07/12/06 17:56:42
Index: vc-mcvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-mcvs.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- vc-mcvs.el 10 Nov 2007 05:22:16 -0000 1.32
+++ vc-mcvs.el 6 Dec 2007 17:56:42 -0000 1.33
@@ -294,7 +294,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
- [Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el,v,
D. Goel <=