[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG,
From: |
Paul Eggert |
Subject: |
bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS) |
Date: |
Mon, 23 May 2016 10:40:40 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 |
On 05/23/2016 09:52 AM, Eli Zaretskii wrote:
> Does "git diff --text" fix this?
I tried something like the following, which as I understand it is the
procedure recommended for putting UTF-16 files under Git control on
GNU/Linux hosts (the basic idea is that the repository contains UTF-8
and the working files contain UTF-16):
* Add the line 'test-chin-jap.tex filter=utf16' to .gitattributes.
* git config filter.utf16.clean 'iconv -f utf-16 -t utf-8'
* git config filter.utf16.smudge 'iconv -f utf-8 -t utf-16'
* Commit the file all over again (as this stores the UTF-8 version in
the repository, not the UTF-16 version).
* Make a trivial edit to the file in the non-ASCII region.
When I did all all this, Emacs 24.5 works and draft Emacs 25 shows
mojibake, so we indeed have a regression. The shell command 'git diff'
works fine, and outputs the difference in UTF-8, but I guess draft Emacs
25 treats the git diff output as UTF-16.
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), (continued)
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Eli Zaretskii, 2016/05/24
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Dmitry Gutov, 2016/05/24
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Eli Zaretskii, 2016/05/25
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Dmitry Gutov, 2016/05/25
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Uwe Brauer, 2016/05/26
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Eli Zaretskii, 2016/05/26
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Paul Eggert, 2016/05/25
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Eli Zaretskii, 2016/05/25
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Paul Eggert, 2016/05/25
- bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS), Eli Zaretskii, 2016/05/25
bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS),
Paul Eggert <=