[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Ediff-patch-file with wrong default buffer
From: |
Andreas Schwab |
Subject: |
Re: Ediff-patch-file with wrong default buffer |
Date: |
Mon, 14 Dec 2009 10:35:24 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) |
Juri Linkov <address@hidden> 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, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
- Re: Fix info display of images, (continued)
- Re: Fix info display of images, Juri Linkov, 2009/12/07
- Re: Fix info display of images, David Kastrup, 2009/12/07
- Re: Fix info display of images, David Kastrup, 2009/12/13
- Re: Fix info display of images, Juri Linkov, 2009/12/13
- Re: Fix info display of images, Chong Yidong, 2009/12/13
- Ediff-patch-file with wrong default buffer (was: Fix info display of images), Juri Linkov, 2009/12/14
- Re: Ediff-patch-file with wrong default buffer (was: Fix info display of images), Michael Kifer, 2009/12/14
- Re: Ediff-patch-file with wrong default buffer, Juri Linkov, 2009/12/14
- Re: Ediff-patch-file with wrong default buffer, Michael Kifer, 2009/12/14
- Re: Ediff-patch-file with wrong default buffer, Juri Linkov, 2009/12/14
- Re: Ediff-patch-file with wrong default buffer,
Andreas Schwab <=