From: Andreas Schwab <schwab@linux-m68k.org>
To: Juri Linkov <juri@jurta.org>
Cc: kifer@cs.sunysb.edu, emacs-devel@gnu.org
Subject: Re: Ediff-patch-file with wrong default buffer
Date: Mon, 14 Dec 2009 10:35:24 +0100 [thread overview]
Message-ID: <m2my1lgaoz.fsf@igel.home> (raw)
In-Reply-To: <87ocm2m6v3.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 07:47:36 +0200")
Juri Linkov <juri@jurta.org> 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."
prev parent reply other threads:[~2009-12-14 9:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-05 23:48 Fix info display of images David Kastrup
2009-12-07 17:55 ` Juri Linkov
2009-12-07 20:28 ` David Kastrup
2009-12-13 11:09 ` David Kastrup
2009-12-13 18:31 ` Juri Linkov
2009-12-14 4:16 ` Chong Yidong
2009-12-14 5:14 ` Ediff-patch-file with wrong default buffer (was: Fix info display of images) Juri Linkov
2009-12-14 5:43 ` Michael Kifer
2009-12-14 5:47 ` Ediff-patch-file with wrong default buffer Juri Linkov
2009-12-14 6:15 ` Michael Kifer
2009-12-14 6:54 ` Juri Linkov
2010-02-02 0:31 ` Juri Linkov
2010-02-02 2:34 ` Stefan Monnier
2010-02-02 22:38 ` Juri Linkov
2010-02-02 0:33 ` Juri Linkov
2009-12-14 9:35 ` Andreas Schwab [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2my1lgaoz.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=emacs-devel@gnu.org \
--cc=juri@jurta.org \
--cc=kifer@cs.sunysb.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.