Mercurial > emacs
changeset 87147:e07baccc00fc
Fix vc.el breakage.
| author | Deepak Goel <deego@gnufans.org> |
|---|---|
| date | Thu, 06 Dec 2007 19:56:41 +0000 |
| parents | f984a9eae876 |
| children | ec50a5656cfe |
| files | lisp/ChangeLog lisp/gnus/ChangeLog lisp/vc.el |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 06 19:50:42 2007 +0000 +++ b/lisp/ChangeLog Thu Dec 06 19:56:41 2007 +0000 @@ -1,8 +1,7 @@ 2007-12-06 D. Goel <deego3@gmail.com> - * vc.el: Fix breakage. + * vc.el (vc-update): Fix breakage. * ibuffer.el (ibuffer-current-buffer): Ditto. - * gnus/gnus-start.el (gnus-load): Ditto. * allout.el (allout-write-file-hook-handler): Fix buggy call(s) to `error'. * textmodes/reftex.el (reftex-TeX-master-file): Ditto.
--- a/lisp/gnus/ChangeLog Thu Dec 06 19:50:42 2007 +0000 +++ b/lisp/gnus/ChangeLog Thu Dec 06 19:56:41 2007 +0000 @@ -1,4 +1,5 @@ 2007-12-06 D. Goel <deego3@gmail.com> + * gnus-start.el (gnus-load): Fix breakage from last change. * gnus-art.el (article-make-date-line): Fix buggy call to `error'. * gnus-start.el (gnus-load): Ditto.
--- a/lisp/vc.el Thu Dec 06 19:50:42 2007 +0000 +++ b/lisp/vc.el Thu Dec 06 19:56:41 2007 +0000 @@ -2620,12 +2620,12 @@ (if (eq (vc-checkout-model file) 'locking) (if (eq (vc-state file) 'edited) (error "%s" - (substitute-command-keys - "File is locked--type \\[vc-revert] to discard changes")) + (substitute-command-keys + "File is locked--type \\[vc-revert] to discard changes")) (error "Unexpected file state (%s) -- type %s" - (vc-state file) - (substitute-command-keys - "\\[vc-next-action] to correct")) + (vc-state file) + (substitute-command-keys + "\\[vc-next-action] to correct"))) (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) (error "Sorry, merging news is not implemented for %s" (vc-backend file))