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: Why did every line in w32fns.c get a ^M? Date: Thu, 1 Jul 2010 12:37:36 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1277980691 30653 80.91.229.12 (1 Jul 2010 10:38:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 10:38:11 +0000 (UTC) To: Emacs-Devel devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 01 12:38:10 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 1OUH9h-0003VC-Hn for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 12:38:05 +0200 Original-Received: from localhost ([127.0.0.1]:50003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUH9g-0007dg-S0 for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 06:38:04 -0400 Original-Received: from [140.186.70.92] (port=56953 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUH9b-0007d4-2f for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:38:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUH9a-0000F2-0F for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:37:58 -0400 Original-Received: from mail-ew0-f41.google.com ([209.85.215.41]:62057) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUH9Z-0000Eu-RT for emacs-devel@gnu.org; Thu, 01 Jul 2010 06:37:57 -0400 Original-Received: by ewy28 with SMTP id 28so848174ewy.0 for ; Thu, 01 Jul 2010 03:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=Es2kCwQbhMzPUaSnJpptNx6+sAEAkzmu+dgcCbW1Sco=; b=vdgmV8I3xy7ytHzeryepKUVqO7GEw7T9pPZgBorTFLmJ5dOwK0HEzjStepL+hGg19r amgqzK4MUcCC9wbkP1ku8U6XaqIxZ5i/G3RNC3T4cdSz3ExUzb7Q3FaGyM/OXH7Qz7y7 ZiSQFCtK92n2r6CLkskGg64f+2QFPH4ewswEg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=GcABuHt20hUk/hCOHQl4N3ECivaADXXEFxvvnP2n4O0eqhmEOa7gWDteE/lVd0EMVK ce4AlZ6Z9qqzZVWJ2wAG2jdjxYaXBhph8eqVauidZiTTBdB+vqBqc1zsshQFsvUNyHB/ ZHv28XwxMFLGgdK7epFHiMGb5aW7mMp3fBgL4= Original-Received: by 10.213.25.145 with SMTP id z17mr2077656ebb.62.1277980676405; Thu, 01 Jul 2010 03:37:56 -0700 (PDT) Original-Received: by 10.213.15.132 with HTTP; Thu, 1 Jul 2010 03:37:36 -0700 (PDT) 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:126607 Archived-At: 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.)