From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.devel Subject: [PATCH] misc.texi, files.texi Date: Wed, 3 May 2006 11:24:15 +1200 Message-ID: <17495.59935.582619.357092@farnswood.snap.net.nz> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1146612266 18191 80.91.229.2 (2 May 2006 23:24:26 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 2 May 2006 23:24:26 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 03 01:24:24 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 1Fb4E2-0000iZ-FF for ged-emacs-devel@m.gmane.org; Wed, 03 May 2006 01:24:14 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Fb4E2-0000CF-4U for ged-emacs-devel@m.gmane.org; Tue, 02 May 2006 19:24:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Fb4Ds-0000Bt-KY for emacs-devel@gnu.org; Tue, 02 May 2006 19:24:04 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Fb4Dq-0000BU-Pt for emacs-devel@gnu.org; Tue, 02 May 2006 19:24:04 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Fb4Dq-0000BR-NI for emacs-devel@gnu.org; Tue, 02 May 2006 19:24:02 -0400 Original-Received: from [202.37.101.8] (helo=viper.snap.net.nz) by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fb4E5-0002jl-QP for emacs-devel@gnu.org; Tue, 02 May 2006 19:24:18 -0400 Original-Received: from farnswood.snap.net.nz (p202-124-115-217.snap.net.nz [202.124.115.217]) by viper.snap.net.nz (Postfix) with ESMTP id BECA175668C for ; Wed, 3 May 2006 11:23:56 +1200 (NZST) Original-Received: by farnswood.snap.net.nz (Postfix, from userid 500) id 8F0EF627ED; Wed, 3 May 2006 00:24:16 +0100 (BST) Original-To: emacs-devel@gnu.org X-Mailer: VM 7.19 under Emacs 22.0.50.42 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:53826 Archived-At: The recenty added node "Diff Mode" overlaps slightly and lacks cohesion with the existing node "Comparing Files". This patch attempts to address that. OK to apply? -- Nick http://www.inet.net.nz/~nickrob *** misc.texi 03 May 2006 10:22:09 +1200 1.82 --- misc.texi 03 May 2006 10:46:49 +1200 *************** *** 1830,1835 **** --- 1830,1836 ---- @node Diff Mode, Two-Column, Narrowing, Top @section Diff Mode @cindex Diff mode + @findex diff-mode Diff mode is useful for editing patches and comparisons produced by the @command{diff} program. You can select Diff mode by typing *************** *** 1901,1906 **** --- 1902,1911 ---- (@code{diff-refine-hunk}). @end table + You can also use @kbd{C-x `} to visit successive changed locations + in the two source files, as in Compilation mode (@pxref{Compilation + Mode}.) + @kbd{C-x 4 a} in Diff mode operates on behalf of the target file, but gets the function name from the patch itself. @xref{Change Log}. This is useful for making log entries for functions that are deleted *** files.texi 13 Apr 2006 09:12:42 +1200 1.139 --- files.texi 03 May 2006 10:48:23 +1200 *************** *** 2159,2164 **** --- 2159,2166 ---- running the @code{diff} program, using options taken from the variable @code{diff-switches}. The value of @code{diff-switches} should be a string; the default is @code{"-c"} to specify a context diff. + The @samp{*diff*} buffer uses Diff mode (@pxref{Diff Mode}). + @findex diff-backup The command @kbd{M-x diff-backup} compares a specified file with its most *************** *** 2166,2180 **** @code{diff-backup} compares it with the source file that it is a backup of. - @findex diff-goto-source - @findex diff-mode - @cindex Diff mode - The @samp{*diff*} buffer uses Diff mode, which enables you to use - @kbd{C-x `} to visit successive changed locations in the two source - files, as in Compilation mode (@pxref{Compilation Mode}.) You can - also move to a particular hunk of changes and type @kbd{C-c C-c} - (@code{diff-goto-source}) to visit the corresponding source location. - @cindex patches Differences between versions of files are often distributed as patches, which are the output from the @command{diff} program. You --- 2168,2173 ----