From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: emacs doc changes Date: Mon, 01 May 2006 08:39:24 -0400 Message-ID: <87iropc47e.fsf-monnier+emacs@gnu.org> References: <4nodz4ywgg.fsf@asimov.bwh.harvard.edu> <4nejzv9b98.fsf@asimov.bwh.harvard.edu> <4n7j5l5xt6.fsf_-_@asimov.bwh.harvard.edu> <85fyk9fnxv.fsf@lola.goethe.zz> <4nacah4f88.fsf@asimov.bwh.harvard.edu> <85bquxfn3j.fsf@lola.goethe.zz> <20060419183441.GA3137@gothmog.pc> <85y7y0bmbe.fsf@lola.goethe.zz> <87d5fcot05.fsf-monnier+emacs@gnu.org> <87fyjvdr04.fsf-monnier+emacs@gnu.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1146487281 9425 80.91.229.2 (1 May 2006 12:41:21 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 1 May 2006 12:41:21 +0000 (UTC) Cc: Aaron.Hawley@uvm.edu, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 01 14:41:19 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 1FaXiB-000351-DL for ged-emacs-devel@m.gmane.org; Mon, 01 May 2006 14:41:11 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FaXiA-0001fa-RP for ged-emacs-devel@m.gmane.org; Mon, 01 May 2006 08:41:10 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FaXgX-0008PU-1Q for emacs-devel@gnu.org; Mon, 01 May 2006 08:39:29 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FaXgV-0008NW-LX for emacs-devel@gnu.org; Mon, 01 May 2006 08:39:28 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FaXgU-0008Mm-QY for emacs-devel@gnu.org; Mon, 01 May 2006 08:39:26 -0400 Original-Received: from [209.226.175.25] (helo=tomts5-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FaXkI-00080o-1b; Mon, 01 May 2006 08:43:22 -0400 Original-Received: from alfajor ([70.55.146.223]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20060501123924.GHCQ18394.tomts5-srv.bellnexxia.net@alfajor>; Mon, 1 May 2006 08:39:24 -0400 Original-Received: by alfajor (Postfix, from userid 1000) id 75D3BD9211; Mon, 1 May 2006 08:39:24 -0400 (EDT) Original-To: rms@gnu.org In-Reply-To: (Richard Stallman's message of "Mon, 01 May 2006 00:19:21 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) 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:53720 Archived-At: > The author was Aaron S. Hawley ; the thred started > in emacs-devel with the following post: > http://lists.gnu.org/archive/html/emacs-devel/2006-03/msg00358.html > Did that thread come up with some text that we could use? > If so, could you send it to me? Here is a copy of the above link. His message was followed by 6 replies/comments, so you may want to read the thread. Stefan PS: The mailing-list archive messed up some of the @ thingies. I don't know how to get at the raw rfc822-format text. From: Aaron S. Hawley Subject: diff-mode documentation Date: Wed, 8 Mar 2006 12:07:43 -0500 (EST) The commands and features of Diff mode aren't entirely documumented in the Emacs manual. The following is a patch to files.texi that would add some. There may exist a more appropriate location in the manual (or Emacs) for this all to go. Stefan Monnier, the author of Diff mode, has provided helpful feedback to me on this patch. However, any mistakes are my own. I've tried adopting the style for command tables found elsewhere in the manual. The patch also adds discussion of Diff mode's brilliant feature to interactively correct the patch after any manual edits by the user. Hope this helps, /a ---- Differences between versions of files are often distributed as patches, which are the output from the @command{diff} program. You can use the same Diff mode to operate on a patch by typing @kbd{M-x diff-mode}. Any manual edits you make to a patch with Diff mode will automatically correct the hunk header including insert, delete and file line numbers. Also, the following commands help to navigate, manipulate and apply patches in Diff mode: @table @kbd @item M-n @findex diff-hunk-next Move to the next hunk in the patch. @item M-p @findex diff-hunk-prev Move to the previous hunk in the patch. @item address@hidden @findex diff-file-next Move to the next file hunk in a multiple file patch. @item address@hidden @findex diff-file-prev Move to the previous file hunk in a multiple file patch. @item M-k @findex diff-hunk-kill Kill the current hunk at point. @item M-K @findex diff-file-kill In a patch with multiple files, kill the current patch to a file. @item C-c C-s @findex diff-split-hunk Split the hunk at point. This is useful when manually editing a patch and only works with the unified diff format. @item C-c C-r @findex diff-refine-hunk Recomputes the current hunk by ignoring changes in whitespace. @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}. @item M-r @findex diff-restrict-view @findex widen Restrict the view to the current hunk. @xref{Narrowing}. With a prefix argument of @kbd{C-u} restrict the view to the current patch of a multiple file patch. The view can be widened again with @kbd{M-W}. @item C-c C-a @findex diff-apply-hunk Apply hunk to target file. With a prefix argument of @kbd{C-u}, apply the reverse of the hunk. @item M-A @findex diff-ediff-patch Start an Ediff session with the patch. @xref{Top, Ediff, Ediff, ediff, The Ediff Manual}. @item C-x 4 a Add a new entry to the change log for the current file. @xref{Change Log}. This is useful for log entries for functions that are deleted by the patch. @end table