From: Lennart Borgman <lennart.borgman@gmail.com>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: Emacs-Devel devel <emacs-devel@gnu.org>
Subject: Re: Why did every line in w32fns.c get a ^M?
Date: Thu, 1 Jul 2010 13:36:09 +0200 [thread overview]
Message-ID: <AANLkTilA_rq1RYB4eOJYguC2fXGEFwOU85k8gSalqGRv@mail.gmail.com> (raw)
In-Reply-To: <AANLkTikxCnRk8oRpavbVjX_js3l-OemPPieW-oQurYhl@mail.gmail.com>
On Thu, Jul 1, 2010 at 1:00 PM, Juanma Barranquero <lekktu@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:56, Lennart Borgman <lennart.borgman@gmail.com> 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.
>
> Juanma
>
next prev parent reply other threads:[~2010-07-01 11:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 10:37 Why did every line in w32fns.c get a ^M? Lennart Borgman
2010-07-01 10:42 ` Juanma Barranquero
2010-07-01 10:56 ` Lennart Borgman
2010-07-01 11:00 ` Juanma Barranquero
2010-07-01 11:36 ` Lennart Borgman [this message]
2010-07-01 11:46 ` Juanma Barranquero
2010-07-01 12:56 ` Lennart Borgman
2010-07-01 17:03 ` Eli Zaretskii
2010-07-01 17:03 ` Lennart Borgman
2010-07-01 17:08 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTilA_rq1RYB4eOJYguC2fXGEFwOU85k8gSalqGRv@mail.gmail.com \
--to=lennart.borgman@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=lekktu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.