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 12:56:28 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1277981819 2301 80.91.229.12 (1 Jul 2010 10:56:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 10:56:59 +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 12:56:58 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 1OUHRx-0005pp-NP for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 12:56:58 +0200 Original-Received: from localhost ([127.0.0.1]:35468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUHRx-0006mW-03 for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 06:56:57 -0400 Original-Received: from [140.186.70.92] (port=35124 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUHRr-0006mI-JJ for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:56:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUHRp-0005UW-MW for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:56:51 -0400 Original-Received: from mail-ew0-f41.google.com ([209.85.215.41]:63520) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUHRp-0005UM-E2 for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:56:49 -0400 Original-Received: by ewy28 with SMTP id 28so857131ewy.0 for ; Thu, 01 Jul 2010 03:56:48 -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; bh=a0jBC4l/B8PC/Wcw0dLE1SVr4WGymZ2u4a5QmEkm8Xo=; b=fgwCYNoeC/CpbXpmSUBBRSTtS1t/GGcG0+rE83B2oNlThXsLifbyn1n1cw7KUctdBf dVctaLenqEEueulElqMUT/2FoCeSGQwX8HluMWt3zFmNAiR91HJjN7XSo0Ci78Vp09Oe nDMIDPt5aasvtt4b3K0jGHrt/xzlG7X1XQdvA= 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; b=LR3HFSwjYdDfA3ElsVqNj0x28a6QjviuoctgyvYOS/2uyRthSvHFLmdj77MBTS0ofa 3YLpxHjcSxp7F2nCivmnHEXedumNm2PHskR1LADQ/IhUb/Jb2uM7l/cwvZYLSg3oscyl iR10nb58wzUE66oNY+5WU9C5KzoZ5Hg2ZU77w= Original-Received: by 10.213.10.147 with SMTP id p19mr5057587ebp.76.1277981808227; Thu, 01 Jul 2010 03:56:48 -0700 (PDT) Original-Received: by 10.213.15.132 with HTTP; Thu, 1 Jul 2010 03:56:28 -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:126610 Archived-At: On Thu, Jul 1, 2010 at 12:42 PM, Juanma Barranquero wrote: > On Thu, Jul 1, 2010 at 12:37, Lennart Borgman wrote: > >> When I just updated I got a merge conflict in w32fns.c. At the same >> time all the lines in that file got a ^M at the end. >> >> Why did they get that? (This is on w32.) > > Did you have local changes on w32fns.c? Perhaps you mixed CRLF vs LF. > Have you tried reverting the file? I have a lot of changes there, but I don't think there were any mix of CRLF vs LF.