Re: 4 minor suggestions for files.el

["Stefan Monnier" <monnier+gnu/emacs@rum.cs.yale.edu>]

>     We already have that.  vc-merge (C-x v m) can do it; just specify the
>     version numbers in reverse.  E.g. typing C-x v m 1.4 RET 1.2 RET takes
>     out the changes that were made from version 1.2 to 1.4.
> 
> (I didn't know about vc-merge.)
> 
> For vc-merge, since that is an explicit command to apply a patch to
> the buffer, I think it would be right for the patch to be undoable.
> Is it undoable now?

No.

> Could it be made so?  Would that require a change
> somewhat like the one Stefan proposed?

Yes, indeed.
My suggested change indeed allows the change to be undone.
The reason is the following: vc-merge works on the file rather than
on the buffer, so after the merge happens, VC does a revert-buffer
(unless the buffer was modified), so my suggested change allows
you to undo it because it can undo the revert-buffer.


	Stefan