[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: diff-mode documentation

From: Stefan Monnier
Subject: Re: diff-mode documentation
Date: Tue, 14 Mar 2006 11:15:16 -0500
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux)

> On Thu, 9 Mar 2006, Richard Stallman wrote:
>> @item M-R
>> @findex diff-reverse-direction
>> Convert the patch to a patch that reverts.
>> @xref{Reversed Patches, Applying Reversed Patches, Patch, diff,
>> Comparing and Merging Files}.
>> @item M-U
>> @findex diff-context->unified
>> Convert the patch to the unified diff format.
>> @xref{Unified Format, Unified Format, Diff, diff,
>> Comparing and Merging Files}.
>> @item M-C
>> @findex diff-unified->context
>> Convert the patch back to context diff format.
>> @xref{Context Format, Context Format, Diff, diff,
>> Comparing and Merging Files}.
>> I would rather these be C-c commands.  They are not the sort of commands
>> one would repeat over and over in a short period, so there's no harm
>> in using C-c, and that would make it possible for the M- commands
>> to be case-independent.

Good point.  These bindings date back to the beginning of diff-mode when
I wasn't following coding conventions as much and when all the other
bindings were under M-<something> so it seemed like a natural choice at
that point.

> I haven't heard anything from Stefan on this, but to get the "ball
> rolling" I suppose we're talking about a patch like the one below.  I'm

Sorry, I missed a couple days of this mailing list cause fsf's mailohost got
put on some random blacklist again.  At least this time I finally managed to
convince my sysadmin that add a whitelist that overrules the blacklist, so
hopefully the problem won't re-appear in the near future.

> --- diff-mode.el        19 Feb 2006 14:01:04 -0500      1.84
> +++ diff-mode.el        10 Mar 2006 12:33:38 -0500
> @@ -142,8 +142,13 @@
>    `(("\e" . ,diff-mode-shared-map)
>      ;; From compilation-minor-mode.
>      ("\C-c\C-c" . diff-goto-source)
> +    ("\C-ca" . diff-ediff-patch)
> +    ("\C-cr" . diff-reverse-direction)
> +    ("\C-cu" . diff-context->unified)
> +    ("\C-cc" . diff-unified->context)
> +    ("\C-c\C-k" . diff-file-kill)

Bindings of the form C-c <letter> are reserved for the user, so they're out.
Better use C-c C-<something>.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]