mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Fix vc.el breakage.

Browse Source
This commit is contained in:
Deepak Goel 2007-12-06 19:56:41 +00:00
parent c6ddcf3a86
commit 1f325d92d3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -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.

1
lisp/gnus/ChangeLog
View File

@ -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.

10
lisp/vc.el
View File

@ -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))