From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: diff-mode documentation Date: Thu, 09 Mar 2006 12:14:32 -0500 Message-ID: References: Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1141924591 12751 80.91.229.2 (9 Mar 2006 17:16:31 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2006 17:16:31 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 09 18:16:29 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FHOjn-0006H9-Di for ged-emacs-devel@m.gmane.org; Thu, 09 Mar 2006 18:15:44 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FHOjm-0002Y9-MD for ged-emacs-devel@m.gmane.org; Thu, 09 Mar 2006 12:15:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FHOih-000895-3J for emacs-devel@gnu.org; Thu, 09 Mar 2006 12:14:35 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FHOif-00084D-N7 for emacs-devel@gnu.org; Thu, 09 Mar 2006 12:14:34 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FHOif-00083s-Hq for emacs-devel@gnu.org; Thu, 09 Mar 2006 12:14:33 -0500 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FHOlm-0002TI-8w for emacs-devel@gnu.org; Thu, 09 Mar 2006 12:17:46 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34) id 1FHOie-0001eu-KM; Thu, 09 Mar 2006 12:14:32 -0500 Original-To: "Aaron S. Hawley" In-reply-to: (Aaron.Hawley@uvm.edu) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:51414 Archived-At: @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.