From: Eli Zaretskii <eliz@gnu.org>
To: Richard Copley <rcopley@gmail.com>
Cc: monnier@iro.umontreal.ca, 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 06:37:44 +0200 [thread overview]
Message-ID: <83wp12chyf.fsf@gnu.org> (raw)
In-Reply-To: <CAPM58oj+EG=JBEvY_=WUESv8VeCO1-59SQDZsaJ9oThKWKS3mQ@mail.gmail.com> (message from Richard Copley on Sun, 31 Dec 2017 21:13:21 +0000)
> From: Richard Copley <rcopley@gmail.com>
> Date: Sun, 31 Dec 2017 21:13:21 +0000
> Cc: Stefan Monnier <monnier@iro.umontreal.ca>, 29916@debbugs.gnu.org
>
> >> >From 'emacs -Q', visit the patch file, do "M-x diff-mode RET", then
> >> move point into the second diff hunk (in editfns.c) and type RET
> >> (diff-goto-source).
> >
> > You mean M-RET, not RET, right?
>
> No, with that recipe it is bound to o, <mouse-2>, RET, C-c C-c, M-o,
> ESC <mouse-2>, M-RET, <menu-bar> <Diff> <Jump to Source>.
Sorry, what recipe? It's "emacs -Q", isn't it? After visiting
txtWF9rI8yqfI.txt and typing "M-x diff-mode RET", "C-h c RET" says RET
is bound to 'newline'. And "C-h w diff-goto-source RET" says
diff-goto-source is on C-c C-c, M-o, ESC <mouse-2>, M-RET, <menu-bar> <Diff> <Jump to Source>
What am I missing? Why do we get different results both for the
command binding and for the recipe?
> > 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]
next prev parent reply other threads:[~2018-01-01 4:37 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 [this message]
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
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=83wp12chyf.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=29916@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
--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.