Commit 1f325d92 authored by Deepak Goel's avatar Deepak Goel
Browse files

Fix vc.el breakage.

parent c6ddcf3a
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.
......
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.
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment