X-Spam-Check-By:	sourceware.org
To:	cygwin AT cygwin DOT com
From:	=?ISO-8859-1?Q?Ren=E9_Berber?= <r DOT berber AT computer DOT org>
Subject:	Re: Where is patch?
Date:	Wed, 14 Dec 2005 15:11:50 -0600
Lines:	48
Message-ID:	<dnq1qm$a4u$1@sea.gmane.org>
References:	<43A064AD DOT 4050604 AT student DOT lu DOT se> <dnpsv8$o2r$1 AT sea DOT gmane DOT org> <43A08086 DOT 3010405 AT student DOT lu DOT se>
Mime-Version:	1.0
User-Agent:	Mozilla Thunderbird 1.0.2 (Windows/20050317)
In-Reply-To:	<43A08086.3010405@student.lu.se>
OpenPGP:	url=ldap://keyserver.pgp.com
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Unsubscribe:	<mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

Lennart Borgman wrote:
[snip]
> That is interesting. However my problem is with line endings. It turned
> out that the file to patch has CR-LF line endings (which is ok) and the
> patch file had LF line endings. This surprised me, I did not notice it
> first. In my opinion it should not have had that. It came from
> Thunderbird on MS Windows and I just pasted into a new file in Emacs.
> Then Emacs made the decision to save the file with LF line endings.

That's similar to the situation where I found that Cygwin's patch doesn't w=
ork,
the patch file had some ^M, the file to patch didn't and patch 2.5.8 fails =
where
version 2.5.4 works and the CR are not added to the patched file.

> There are two things I would like here:
>=20
> *** For patch: I would like it to discover that the line ending type of
> the patch file and the file to patch differ. I would then like patch to
> convert the line endings in the patch read from the patch file to that
> kind used in the file to patch. (It should not change the patch file of
> course.) That would be enough to solve my problem. However I would like
> such functionality to go into the main patch distribution if possible.
> That would save work I hope.

Try version 2.5.4 it probably works already.

> *** For Emacs: I would like the default on MS Windows to be CR-LF line
> endings. That would in my opinion be less surpricing for an MS Windows
> user.

There is no Windows standard, if you use Notepad you end with CR-LF endings=
, if
you use Wordpad you end with LF endings (or a mixture), in Word you can cho=
ose,
...  Emacs can be configured but that is the user option not a standard.

Regards.
--=20
Ren=E9 Berber



--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

- Raw text -