all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: diff-mode documentation
Date: Tue, 14 Mar 2006 11:15:16 -0500	[thread overview]
Message-ID: <87hd6180un.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <Pine.A41.4.58.0603140943010.89668@elk.uvm.edu> (Aaron S. Hawley's message of "Tue, 14 Mar 2006 09:50:37 -0500 (EST)")

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


        Stefan

  reply	other threads:[~2006-03-14 16:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-08 17:07 diff-mode documentation Aaron S. Hawley
2006-03-09 17:14 ` Richard Stallman
2006-03-09 19:58   ` Aaron S. Hawley
2006-03-11  0:07     ` Richard Stallman
2006-03-14 14:50   ` Aaron S. Hawley
2006-03-14 16:15     ` Stefan Monnier [this message]
2006-03-14 17:46     ` Richard Stallman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87hd6180un.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.