From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Aaron S. Hawley" Newsgroups: gmane.emacs.devel Subject: Re: diff-mode documentation Date: Thu, 9 Mar 2006 14:58:04 -0500 (EST) Organization: University of Vermont Message-ID: References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Trace: sea.gmane.org 1141934351 19710 80.91.229.2 (9 Mar 2006 19:59:11 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2006 19:59:11 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 09 20:59:08 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 1FHRHR-0000n6-T7 for ged-emacs-devel@m.gmane.org; Thu, 09 Mar 2006 20:58:38 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FHRHR-0002kn-80 for ged-emacs-devel@m.gmane.org; Thu, 09 Mar 2006 14:58:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FHRHC-0002X4-RJ for emacs-devel@gnu.org; Thu, 09 Mar 2006 14:58:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FHRHA-0002Hw-W5 for emacs-devel@gnu.org; Thu, 09 Mar 2006 14:58:22 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FHRHA-0002Gs-KC for emacs-devel@gnu.org; Thu, 09 Mar 2006 14:58:20 -0500 Original-Received: from [132.198.101.202] (helo=pony.uvm.edu) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1FHRKE-0000B7-Vc; Thu, 09 Mar 2006 15:01:31 -0500 Original-Received: from gnu.uvm.edu (gnu.uvm.edu [132.198.101.64]) by pony.uvm.edu (8.13.5/8.13.5) with ESMTP id k29Jw4vr018094 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Thu, 9 Mar 2006 14:58:04 -0500 X-X-Sender: ashawley@gnu.uvm.edu Original-To: Richard Stallman In-Reply-To: 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:51416 Archived-At: On Thu, 9 Mar 2006, Richard Stallman wrote: > @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? I'm glad you brought this up. I'm not experienced with the common terminology of patches, so I sort of "winged it". A "file hunk" is indeed the "diff" of a 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? No, it's the same. > I would rather these be C-c commands. > [...] > > @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. I'll let Stefan take this up.