From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Ediff-patch-file with wrong default buffer Date: Tue, 02 Feb 2010 02:33:17 +0200 Organization: JURTA Message-ID: <87k4uwa3ka.fsf@mail.jurta.org> References: <874oo5nfsl.fsf@lola.goethe.zz> <87ljhey8gx.fsf@mail.jurta.org> <874oo2jzq2.fsf@lola.goethe.zz> <87aaxnjfkg.fsf@lola.goethe.zz> <87pr6iskww.fsf@mail.jurta.org> <87eimytcl1.fsf@stupidchicken.com> <87ocm2p1vf.fsf_-_@mail.jurta.org> <20091214004325.61e9afe3@kiferserv> <87ocm2m6v3.fsf@mail.jurta.org> <20091214011540.583ab64a@kiferserv> <87aaxmkput.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1265072148 10903 80.91.229.12 (2 Feb 2010 00:55:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Feb 2010 00:55:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 02 01:55:45 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nc73Q-0002u2-Vh for ged-emacs-devel@m.gmane.org; Tue, 02 Feb 2010 01:55:45 +0100 Original-Received: from localhost ([127.0.0.1]:44587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc73Q-0000nQ-G1 for ged-emacs-devel@m.gmane.org; Mon, 01 Feb 2010 19:55:44 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nc72b-0000ND-OE for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:53 -0500 Original-Received: from [199.232.76.173] (port=38305 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nc72b-0000Mt-9n for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:53 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nc72W-0000AV-5m for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:53 -0500 Original-Received: from smtp-out4.starman.ee ([85.253.0.6]:60380 helo=mx2.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nc72V-00009r-Lz for emacs-devel@gnu.org; Mon, 01 Feb 2010 19:54:48 -0500 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Original-Received: from mail.starman.ee (82.131.53.239.cable.starman.ee [82.131.53.239]) by mx2.starman.ee (Postfix) with ESMTP id 32E203F40A5 for ; Tue, 2 Feb 2010 02:54:41 +0200 (EET) In-Reply-To: <87aaxmkput.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 08:54:18 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120805 Archived-At: > The GNU Diff manual defines the unified format which looks like this: > > --- FROM-FILE FROM-FILE-MODIFICATION-TIME > +++ TO-FILE TO-FILE-MODIFICATION-TIME Yet another problem with bzr and diff formats: For Lisp files it's useful to set vc-bzr-diff-switches to "-F ^(" or diff --diff-options '-F ^(' aka `--show-function-line' to show a function/variable name that precedes the hunk (like "@@ (defvar ispell-message-text-end" in the patch below). But in this case, with (add-hook 'message-send-hook 'ispell-message) `ispell-message' checks the spelling of the whole patch that is annoying. `ispell-message-text-end' defines the limit of spell-checking for unidiff/context diff formats. But it is too strict. This patch removes the final newline to allow more text after @@: === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2010-01-14 18:59:31 +0000 +++ lisp/textmodes/ispell.el 2010-02-02 00:32:03 +0000 @@ -3459,7 +3459,7 @@ (defvar ispell-message-text-end ;; Matches context difference listing "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" ;; Matches unidiff difference listing - "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n" + "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@" ;; Matches reporter.el bug report "^current state:\n==============\n" ;; Matches commonly used "cut" boundaries -- Juri Linkov http://www.jurta.org/emacs/