bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing

[Richard Copley]

> What am I missing?  Why do we get different results both for the
> command binding and for the recipe?

Read-only mode. For some reason, my copy of the patch file has
the read-only attribute set. Sorry, I hadn't noticed that.

>> > If not, where did you get the ported Diff command?
>>
>> It's the (ubiquitous) gnuwin32 port of diff 2.8.7.
>
> Same here.
>
>> > 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?
>>
>> Do you mean utf-8, with the end of line conversion left unspecified?
>> According to the manual (33.10.1), "'emacs-internal’ is an alias for
>> ‘utf-8-emacs’."
>
> "C-h C emacs-internal RET" says:
>
>   U -- emacs-internal (alias of utf-8-emacs-unix)
>
>   Support for all Emacs characters (including non-Unicode characters).
>   Type: utf-8 (UTF-8: Emacs internal multibyte form)
>   EOL type: LF
>
> So emacs-internal fixes the EOL format at Unix-style LF.  By contrast,
> utf-8-emacs does not:
>
>   U -- utf-8-emacs
>
>   Support for all Emacs characters (including non-Unicode characters).
>   Type: utf-8 (UTF-8: Emacs internal multibyte form)
>   EOL type: Automatic selection from:
>           [utf-8-emacs-unix utf-8-emacs-dos utf-8-emacs-mac]

OK, thanks. Then I think the sentence I quoted is a documentation bug.