diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/vc.el | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 236419d04f6..a552490c02b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5a2db800f0a..df1865b2767 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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. diff --git a/lisp/vc.el b/lisp/vc.el index 6fd6e25bd88..995bcc25692 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -2620,12 +2620,12 @@ changes from the current branch are merged into the working file." (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)) |