all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] emacs-25 e30c3e9: Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
Date: Fri, 01 Apr 2016 10:14:56 +0300	[thread overview]
Message-ID: <83oa9tu7f3.fsf@gnu.org> (raw)
In-Reply-To: <jwvk2ki49pv.fsf-monnier+emacsdiffs@gnu.org> (message from Stefan Monnier on Thu, 31 Mar 2016 17:30:48 -0400)

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Thu, 31 Mar 2016 17:30:48 -0400
> 
> > --- a/lisp/vc/vc-annotate.el
> > +++ b/lisp/vc/vc-annotate.el
> [...]
> > +        ;; On DOS/Windows, "svn annotate" will produce CRLF EOLs even
> > +        ;; if the original file has Unix EOLs, which will show ^M
> > +        ;; characters in the Annotate buffer.  Prevent that by forcing
> > +        ;; DOS EOL decoding.
> > +        (if (memq system-type '(windows-nt ms-dos))
> > +            (setq coding-system-for-read
> > +                  (coding-system-change-eol-conversion coding-system-for-read
> > +                                                       'dos)))
> 
> Why do we need to put this in vc-annotate rather than in vc-svn.el?

Because it's vc-annotate that commits the crime in the first place:

    (with-output-to-temp-buffer temp-buffer-name
      (let ((backend (or vc-bk (vc-backend file)))
	    (coding-system-for-read buffer-file-coding-system))
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Any command running on MS-Windows should be expected to produce a CRLF
output, so inheriting EOL decoding from the buffer is not a good idea.



  reply	other threads:[~2016-04-01  7:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20160331200230.13543.3434@vcs.savannah.gnu.org>
     [not found] ` <E1alinW-0003XD-6G@vcs.savannah.gnu.org>
2016-03-31 21:30   ` [Emacs-diffs] emacs-25 e30c3e9: Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows Stefan Monnier
2016-04-01  7:14     ` Eli Zaretskii [this message]
2016-04-01 13:21       ` Stefan Monnier

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=83oa9tu7f3.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /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.