From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS) Date: Wed, 25 May 2016 15:44:08 +0300 Message-ID: <5fb39ec5-a6fc-1e9d-8a44-a73fdfd5c14c@yandex.ru> References: <87bn3z4l9i.fsf@mat.ucm.es> <1444321464004323@web25h.yandex.ru> <83h9do67pp.fsf@gnu.org> <21f6198c-a2fc-365f-caf7-79fad5027f1c@yandex.ru> <32b48032-8b30-d1d4-259c-8715aad3e7b8@cs.ucla.edu> <86c6d05c-a37f-e223-d0d2-af63d09ed0cc@yandex.ru> <57454B75.6070506@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1464181182 13105 80.91.229.3 (25 May 2016 12:59:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 May 2016 12:59:42 +0000 (UTC) Cc: oub@mat.ucm.es, 23595@debbugs.gnu.org To: Paul Eggert , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 25 14:59:32 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1b5YPM-0004JQ-5R for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 May 2016 14:59:32 +0200 Original-Received: from localhost ([::1]:59815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5YPL-0001z4-Du for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 May 2016 08:59:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5YBN-0006CL-Tp for bug-gnu-emacs@gnu.org; Wed, 25 May 2016 08:45:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5YBK-0005Cg-6a for bug-gnu-emacs@gnu.org; Wed, 25 May 2016 08:45:04 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5YBK-0005Cc-3W for bug-gnu-emacs@gnu.org; Wed, 25 May 2016 08:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1b5YBJ-0003gP-UM for bug-gnu-emacs@gnu.org; Wed, 25 May 2016 08:45:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 May 2016 12:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23595 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23595-submit@debbugs.gnu.org id=B23595.146418025814089 (code B ref 23595); Wed, 25 May 2016 12:45:01 +0000 Original-Received: (at 23595) by debbugs.gnu.org; 25 May 2016 12:44:18 +0000 Original-Received: from localhost ([127.0.0.1]:37062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5YAc-0003fB-CS for submit@debbugs.gnu.org; Wed, 25 May 2016 08:44:18 -0400 Original-Received: from mail-wm0-f44.google.com ([74.125.82.44]:35878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5YAa-0003ez-NC for 23595@debbugs.gnu.org; Wed, 25 May 2016 08:44:17 -0400 Original-Received: by mail-wm0-f44.google.com with SMTP id n129so179941173wmn.1 for <23595@debbugs.gnu.org>; Wed, 25 May 2016 05:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=DboRBdNfsinu6Ug5Fiq1OFs4DM4cnQmvs98YFYhaCOk=; b=yOo1TD7wSipkiwj6xLWQN7Bma+EaWmausaZpmf3TfVGS0X4vOy3mi6lHhJRU1Dn0uq DoUzhGj6H9vU4yVsZngx55yHK9ej8zs+zd6eqkpaw650TG2lMlfnDKJSNt9V3k2nNdBZ X4iZk2cR/KCPCMM2sJFOFU246SCRzNZUmCFqJIlMtD74wkxMk83nGl5vbKRGQ5MbroDi qTvZjxLF9BYUDamRZBcREZkY6hLTt+eg+LVL1ZWzwuw0xGOv0gAL9M/Lsdqj5te1yunx /Zzjrl76YmiXibVtFM2dxF8ext4ub6/KvQCtYldy+1U0zxuDa2PuMguxWiK/ZsggOAms uGZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=DboRBdNfsinu6Ug5Fiq1OFs4DM4cnQmvs98YFYhaCOk=; b=GcAhRVxgf7pWElO1rJfQuWuFEkd6kx3vVZAvjSdKpE0ww23eL/Jwf3NeuT8e0mNFqX 3YSxMhfQS8wPiT0qo5PKeGi2eQWjsOcLzrAep9FPWfG1xNrJ6bhY7nKhBnMkDCJAipBR ruJgj+0mjgHe2mxyckSwsZi+lGfcEyDG+P3JtB9VL/5z6dl3fXuKqjR5zbdFP9/5ca2H qOO9boCFGTtktMz+RW/i8pNHnCK8lUJ+e4D7Ign11SthPNtG1rPTFdxrQMG6hox6VXW7 e/IOUTADtG+fIu+1iMv5rHkTIr2KNtPl2rt7kxhK32OIlahrkKHwwavJudNmIlppepzs IGPw== X-Gm-Message-State: ALyK8tKrYwbxgRvWEVvSOrMDg36V4xxIGT/1GVE/lfmkmmKOsZcJn68tS41axZbzYe6gZg== X-Received: by 10.194.206.39 with SMTP id ll7mr3573792wjc.179.1464180250731; Wed, 25 May 2016 05:44:10 -0700 (PDT) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id on2sm8618654wjc.32.2016.05.25.05.44.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 May 2016 05:44:09 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1 In-Reply-To: <57454B75.6070506@cs.ucla.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:118653 Archived-At: On 05/25/2016 09:51 AM, Paul Eggert wrote: > Yes. For emacs-25 that's probably too much, as you suggest. So we can > fix the problem in vc-coding-system-for-diff. Revised > (more-conservative) patch attached. Looks good, thanks. We should also test it with different backends, to see if it helps with this problem in each of them (at least to some extent). Like Eli said, it might also cause new problems in some of them.