unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: oub@mat.ucm.es, eggert@cs.ucla.edu, 23595@debbugs.gnu.org
Subject: bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS)
Date: Tue, 24 May 2016 05:36:46 +0300	[thread overview]
Message-ID: <83twho41xd.fsf@gnu.org> (raw)
In-Reply-To: <21f6198c-a2fc-365f-caf7-79fad5027f1c@yandex.ru> (message from Dmitry Gutov on Tue, 24 May 2016 00:02:36 +0300)

> Cc: oub@mat.ucm.es, 23595@debbugs.gnu.org, Paul Eggert <eggert@cs.ucla.edu>
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Tue, 24 May 2016 00:02:36 +0300
> 
> On 05/23/2016 07:48 PM, Eli Zaretskii wrote:
> 
> >>> The resulting diff contains either rubbish or fails to run.
> >>> Files attached.
> >
> > I don't see any rubbish in the Git output.
> 
> Might that have to do something with your OS? I see the mojibake like 
> others.

I was talking about the attachment Uwe provided, so this has nothing
to do with my OS.

> > As for the first problem, we should probably refrain from binding
> > coding-system-for-read to a CODING-SYSTEM for which
> >
> >    (coding-system-get CODING-SYSTEM :ascii-compatible-p)
> >
> > returns nil.  We should instead bind it to no-conversion and decode
> > the file data parts by hand, skipping the parts that Git itself
> > outputs (yes, this is messy).  Patches to that effect are welcome.
> 
> Not sure what's the best place to do it, but the patch below gives me 
> 24.5's behavior (correctly decoding the short "Binary files ... differ" 
> output). Could someone try it together with Paul's solution?

Paul's solution is outside of Emacs's realm.  What Emacs should do is
bind coding-system-for-read to utf-8 in this case (not leave it
unbound as in your patch), under the assumption that the user used the
procedure outlined by Paul.





  parent reply	other threads:[~2016-05-24  2:36 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-21 13:02 bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS) Uwe Brauer
2016-05-23 11:52 ` Dmitry Gutov
2016-05-23 12:41   ` Uwe Brauer
2016-05-23 13:17     ` Dmitry Gutov
2016-05-23 16:52       ` Eli Zaretskii
2016-05-23 16:51     ` Eli Zaretskii
2016-05-23 16:48   ` Eli Zaretskii
2016-05-23 17:00     ` Uwe Brauer
2016-05-23 17:31       ` Eli Zaretskii
2016-05-23 20:37         ` Uwe Brauer
2016-05-23 21:01           ` Lars Ingebrigtsen
2016-05-24  2:33           ` Eli Zaretskii
2016-05-23 21:02     ` Dmitry Gutov
2016-05-23 22:16       ` Paul Eggert
2016-05-23 22:28         ` Dmitry Gutov
2016-05-24  0:07           ` Paul Eggert
2016-05-24  9:47             ` Dmitry Gutov
2016-05-25  6:51               ` Paul Eggert
2016-05-25 12:44                 ` Dmitry Gutov
2016-05-24  2:40         ` Eli Zaretskii
2016-05-24 15:36           ` Eli Zaretskii
2016-05-24  2:36       ` Eli Zaretskii [this message]
2016-05-24  9:35         ` Dmitry Gutov
2016-05-24 15:40           ` Eli Zaretskii
2016-05-25  0:09             ` Dmitry Gutov
2016-05-25 16:22               ` Eli Zaretskii
2016-05-25 23:21                 ` Dmitry Gutov
2016-05-26 10:44                   ` Uwe Brauer
2016-05-26 15:35                   ` Eli Zaretskii
2016-06-19 19:09                     ` Dmitry Gutov
2016-05-25  6:19           ` Paul Eggert
2016-05-25 16:27             ` Eli Zaretskii
2016-05-25  6:19         ` Paul Eggert
2016-05-25 16:26           ` Eli Zaretskii
2016-05-23 17:40 ` Paul Eggert
2016-05-23 18:15   ` 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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83twho41xd.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=23595@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    --cc=eggert@cs.ucla.edu \
    --cc=oub@mat.ucm.es \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).