all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Richard Copley <rcopley@gmail.com>, 29916@debbugs.gnu.org
Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing
Date: Mon, 01 Jan 2018 18:23:44 -0500	[thread overview]
Message-ID: <jwvlghh9nnc.fsf-monnier+bug#29916@gnu.org> (raw)
In-Reply-To: <83y3lid8eg.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 31 Dec 2017 21:06:31 +0200")

> I suggest to use utf-8-emacs instead of emacs-mule (you _really_ don't
> want the latter).  I do agree that forcing -unix EOL when decoding the
> output of Diff is probably wrong.  Stefan?

I guess utf-8-emacs would work as well, yes (I don't think the forcing
of Unix EOL was intended when I changed emacs-mule into emacs-internal).


        Stefan





  parent reply	other threads:[~2018-01-01 23:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-31 18:33 bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Richard Copley
2017-12-31 19:06 ` Eli Zaretskii
2017-12-31 21:13   ` Richard Copley
2018-01-01  4:37     ` Eli Zaretskii
2018-01-01 11:02       ` Richard Copley
2018-01-01 11:51         ` Richard Copley
2018-01-01 16:39           ` Eli Zaretskii
2018-01-01 16:37         ` Eli Zaretskii
2018-01-01 23:23   ` Stefan Monnier [this message]
2018-01-02 21:41     ` Richard Copley
2018-01-03 15:18       ` Eli Zaretskii
2018-01-05  9:23         ` Eli Zaretskii

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='jwvlghh9nnc.fsf-monnier+bug#29916@gnu.org' \
    --to=monnier@iro.umontreal.ca \
    --cc=29916@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    --cc=rcopley@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.