From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: Why did every line in w32fns.c get a ^M? Date: Thu, 1 Jul 2010 13:36:09 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1277984204 10708 80.91.229.12 (1 Jul 2010 11:36:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 11:36:44 +0000 (UTC) Cc: Emacs-Devel devel To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 01 13:36:40 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 1OUI4M-00047H-UT for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 13:36:39 +0200 Original-Received: from localhost ([127.0.0.1]:36769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUI4M-0003Dg-BG for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 07:36:38 -0400 Original-Received: from [140.186.70.92] (port=37958 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUI4G-0003Cp-GA for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:36:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUI4F-0002Dv-8Y for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:36:32 -0400 Original-Received: from mail-ew0-f41.google.com ([209.85.215.41]:55830) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUI4F-0002Di-0v for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:36:31 -0400 Original-Received: by ewy28 with SMTP id 28so875378ewy.0 for ; Thu, 01 Jul 2010 04:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=a41jpfN6TRuHHOLLRwJYc9njHxN8Q+0sLhlKUCUPFto=; b=nUtPf3MGCfB/ZlkgrIdaEfB8OTaMMlUkJPSKXdomOQva4ri7W+Fn9f187W9Pvq2kFB WiDPO0g9ZfPksyN6poTcLGjzsOS3ZkNsLeCWXW8X2aZWKwXHOfGSGGnMyy7HcKby+mnm QnBihp3PlqmZzEDHmspRRFi6EipLasQsifKzg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=hrkfZmJyIFFyQrVARlEVZarEILKloDI1043KGlqSwgj66mSgZsZyv9bDMtVt9nfsDJ YKZSd3FCiOE96mY948exV7mNMOI1Q3y0o2c9jNzUNFpb2sM3gK+hFhDgS0frZJx04ml9 NF1Nb+FXKgyqatfiaRG5+xH3xFHJ1+PjVDtT4= Original-Received: by 10.213.32.197 with SMTP id e5mr5362425ebd.28.1277984189586; Thu, 01 Jul 2010 04:36:29 -0700 (PDT) Original-Received: by 10.213.15.132 with HTTP; Thu, 1 Jul 2010 04:36:09 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:126612 Archived-At: On Thu, Jul 1, 2010 at 1:00 PM, Juanma Barranquero wrote= : > On Thu, Jul 1, 2010 at 12:56, Lennart Borgman = wrote: > >> I have a lot of changes there, but I don't think there were any mix of >> CRLF vs LF. > > The sudden appearance of ^M at the end of lines is an almost-100% sure > sign of such a mixup. When we're talking of a file that in a Bzr > checkout is LF, but it is often edited with CRLF-prone Windows tools, > the likelihood surpasses 100% :-) The only tool I used editing it is Emacs ;-) But it looks like w32fns.c somehow got saved with CRLF line endings (I have no idea why) and it looks like bzr merge could not handle that at all. > So, please save your w32fns.c, revert it, and if it works, you know > the problem is in your changes... Certainly my w32fns.c has no trouble > whatsoever right now. > > =C2=A0 =C2=A0Juanma >