diff options
| author | Deepak Goel <deego@gnufans.org> | 2007-12-06 17:56:42 +0000 |
|---|---|---|
| committer | Deepak Goel <deego@gnufans.org> | 2007-12-06 17:56:42 +0000 |
| commit | 8c16bd8c3566df3b0cbbc28692a23a378604f423 (patch) | |
| tree | d88150553f83a3c0a45400ca7595965f85486f66 /lisp/vc-mcvs.el | |
| parent | 864da779a612cc75366bee12ab5f6f2859231f18 (diff) | |
| download | emacs-8c16bd8c3566df3b0cbbc28692a23a378604f423.tar.gz | |
Fix buggy calls to `error'.
Diffstat (limited to 'lisp/vc-mcvs.el')
| -rw-r--r-- | lisp/vc-mcvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index b5a81866eca..c3b68f8aeaf 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -294,7 +294,7 @@ This is only possible if Meta-CVS is responsible for FILE's directory.") ((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 |