Re: Diff Mode: Can I apply a difference to a buffer of my choosing?

[Alan Mackenzie]

Stefan Monnier <monnier@iro.umontreal.ca> wrote on Sat, 04 Feb 2006
17:35:55 -0500:
>> .  I have loaded cc-defs.el.diff into a buffer in Diff Mode.  I want
>> to apply one of its diffs to a buffer (coincidentally also called
>> cc-defs.el).  However, when I try C-c C-a (`diff-apply-hunk'), Emacs
>> loads a different version of cc-defs.el, and applies the patch to
>> that.

> diff-mode basically looks at the diff's header (or "Index:" line) to
> find the file name to which the patch should be applied, then does
> find-file on that file to get the buffer.

> So you can try to get what you want, by doing a M-x cd in the diff's
> buffer before C-c C-a (presumaing the diff's header uses relative path
> names).

YES, YES, YES!!!  Brilliant!  Fantastic!  That works!

Thanks!

>> Is there any convenient way of associating cc-defs.el.diff with the
>> buffer I want to change?

> In Emacs-CVS, I've added a command diff-tell-file-name to do just that
> (tho it still doesn't allow you to bind to a buffer, only to a
> filename).

OK.  Binding to a buffer would be nice to have, but binding to a file
will be good enough nearly all the time.

> In previous versions, what you can do is M-x cd RET /some/where/else
> since if diff-mode can't find the file on its own, it then asks you to
> enter the destination file name interactively.

Again, thanks!

>         Stefan

-- 
Alan Mackenzie (Munich, Germany)
Email: aacm@muuc.dee; to decode, wherever there is a repeated letter
(like "aa"), remove half of them (leaving, say, "a").