RE: Error when applying hunk in Diff buffer

[Marshall, Simon]

> The change in Emacs-22 is that the diff can be done locally 
> (with `diff') rather than via `cvs'.  If you remove the file 
> <foo>.~.<rev>~, then it'll force VC to ask `cvs' to do the 
> diff and you'll get a header just like the one we get with -L 
> (this use of -L is specifically to reproduce the header that 
> `cvs' would have output).
> 
> So you'd basically have to tell VC to knot use the local copy 
> of the file in vc-diff-internal.

As Andre suggested, setting vc-stay-local to nil solves the problem.

Maybe vc-stay-local should be set when vc-diff-internal sets
vc-diff-knows-L?  Or maybe vc-stay-local should default to nil so vc.el
always works?   It seems wrong that vc.el may not work out of the box and
that the user is expected to change some variable to make it work.  

Or maybe if vc-diff-knows-L is 'no then vc-stay-local should be ignored
(treated as if nil)?  Or maybe those 2 variables should be combined?  I
appreciate they are used at different times.

Or maybe diff-mode should be able to cope with a diff like this:

*** ChangeLog.~1.481.~  Mon Jul 17 09:47:44 2006
--- ChangeLog   Thu Jul 20 11:59:52 2006
***************
*** 1,7 ****
  2006-07-14  Eli Zaretskii  <address@hidden>
  
        * configure.in (PKG_CHECK_MODULES): Redirect the output of
-       $PKG_CONFIG --exists "$2" to config.log.
        * configure: Regenerated.
  
  2006-07-14  Kim F. Storm  <address@hidden>
--- 1,6 ----

And DTRT?  Though I don't know if that would be easy or even desirable
(maybe it would break some expected behaviour)...

Lots of questions, hopefully an easy answer.  Simon.