From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Ediff-patch-file with wrong default buffer Date: Mon, 14 Dec 2009 10:35:24 +0100 Message-ID: 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1260783358 30968 80.91.229.12 (14 Dec 2009 09:35:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Dec 2009 09:35:58 +0000 (UTC) Cc: kifer@cs.sunysb.edu, emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 14 10:35:45 2009 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.50) id 1NK7LC-0000Em-JZ for ged-emacs-devel@m.gmane.org; Mon, 14 Dec 2009 10:35:42 +0100 Original-Received: from localhost ([127.0.0.1]:51181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NK7LC-0002HL-F3 for ged-emacs-devel@m.gmane.org; Mon, 14 Dec 2009 04:35:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NK7L3-0002Gv-H3 for emacs-devel@gnu.org; Mon, 14 Dec 2009 04:35:33 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NK7Ky-0002Fx-Mg for emacs-devel@gnu.org; Mon, 14 Dec 2009 04:35:32 -0500 Original-Received: from [199.232.76.173] (port=33437 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NK7Ky-0002Fp-El for emacs-devel@gnu.org; Mon, 14 Dec 2009 04:35:28 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:47954) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NK7Ky-0007OY-7R for emacs-devel@gnu.org; Mon, 14 Dec 2009 04:35:28 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 8F0DE1C15548; Mon, 14 Dec 2009 10:35:26 +0100 (CET) Original-Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id 54BC0906D3; Mon, 14 Dec 2009 10:35:26 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan2.mnet-online.de [192.168.1.215]) (amavisd-new, port 10024) with ESMTP id Vrl+I0Dvah9r; Mon, 14 Dec 2009 10:35:24 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.151.106.ip-pool.NEFkom.net [83.171.151.106]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 14 Dec 2009 10:35:24 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 8BFE0CA28C; Mon, 14 Dec 2009 10:35:24 +0100 (CET) X-Yow: Hold the MAYO & pass the COSMIC AWARENESS... In-Reply-To: <87ocm2m6v3.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 07:47:36 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) 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:118610 Archived-At: Juri Linkov writes: > Index: lisp/ediff-ptch.el > =================================================================== > RCS file: /sources/emacs/emacs/lisp/ediff-ptch.el,v > retrieving revision 1.47 > diff -u -r1.47 ediff-ptch.el > --- lisp/ediff-ptch.el 31 Jan 2009 22:10:29 -0000 1.47 > +++ lisp/ediff-ptch.el 14 Dec 2009 05:47:01 -0000 > @@ -127,7 +127,7 @@ > (concat "\\(" ; context diff 2-liner > "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)" > "\\|" ; GNU unified format diff 2-liner > - "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)" > + "^--- +\\([^ \t]+\\)[\t ]*.*\n\\+\\+\\+ +\\([^ \t]+\\)" Of course, "[\t ]*.*" is equivalent to ".*". Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."