From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#10368: 24.0.92; wrong char-width by display table Date: Fri, 13 Jan 2012 02:50:05 -0500 Message-ID: References: <87boq8i1hd.fsf@m17n.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1326441042 1914 80.91.229.12 (13 Jan 2012 07:50:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 13 Jan 2012 07:50:42 +0000 (UTC) Cc: 10368@debbugs.gnu.org To: Kenichi Handa Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 13 08:50:38 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RlbuG-0008Lp-TL for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Jan 2012 08:50:37 +0100 Original-Received: from localhost ([::1]:57785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlbuF-0004n6-VO for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Jan 2012 02:50:35 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:56823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlbuD-0004n1-9E for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2012 02:50:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rlbu7-0000BD-J9 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2012 02:50:33 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:32893) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rlbu7-0000B6-FK for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2012 02:50:27 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Rlbug-0001f0-C0 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2012 02:51:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Jan 2012 07:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10368 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10368-submit@debbugs.gnu.org id=B10368.13264410506364 (code B ref 10368); Fri, 13 Jan 2012 07:51:02 +0000 Original-Received: (at 10368) by debbugs.gnu.org; 13 Jan 2012 07:50:50 +0000 Original-Received: from localhost ([127.0.0.1]:55799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RlbuU-0001eb-Aw for submit@debbugs.gnu.org; Fri, 13 Jan 2012 02:50:50 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:36594) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RlbuR-0001eT-TN for 10368@debbugs.gnu.org; Fri, 13 Jan 2012 02:50:48 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Rlbtm-0006yU-GY; Fri, 13 Jan 2012 02:50:07 -0500 X-Spook: spy Putin DES UFO class struggle mailbomb Defcon X-Ran: 'yie9`qewy<3+%$(M+eUg7FkiT%.}IO,Q5(7"KLe|;"2Z#+(Es(>ZO! (Kenichi Handa's message of "Fri, 13 Jan 2012 15:02:38 +0900") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:55669 Archived-At: Kenichi Handa wrote: > I've just committed the fix to emacs-23 branch. > > But I have not yet merged it into trunk. When I did the > merging last time, I had a problem (mainly because I didn't > understand bzr well). So, I'd like to ask someone else who > is doing that kind of merging regularly. It's generally pretty straightforward with bzrmerge.el. However, in this case there is a merge conflict that I do not know how to resolve. The code in the trunk has been changed to use `sanitize_char_width'. If you can say what the diff against trunk should look like, I could merge it.