all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Richard Stallman <rms@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: diff-mode documentation
Date: Thu, 09 Mar 2006 12:14:32 -0500	[thread overview]
Message-ID: <E1FHOie-0001eu-KM@fencepost.gnu.org> (raw)
In-Reply-To: <Pine.A41.4.58.0603081149520.88630@gnu.uvm.edu> (Aaron.Hawley@uvm.edu)

    @item M-@}
    @findex diff-file-next
    Move to the next file hunk in a multiple file patch.

I think I can guess what a "file hunk" is.  Is it the part of the
patch that is the diff for one file?

    @findex diff-file-kill
    In a patch with multiple files, kill the current patch to a file.

What does the "current patch to a file"?  Is it different from the
current file hunk?


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

    @item M-A
    @findex diff-ediff-patch
    Start an Ediff session with the patch.
    @xref{Top, Ediff, Ediff, ediff, The Ediff Manual}.

Same story there.

    @item M-K
    @findex diff-file-kill
    In a patch with multiple files, kill the current patch to a file.

This would have to be moved.

  reply	other threads:[~2006-03-09 17:14 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 [this message]
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
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=E1FHOie-0001eu-KM@fencepost.gnu.org \
    --to=rms@gnu.org \
    --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.