From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: unicode merge failures 2007-10-12 Date: Thu, 11 Oct 2007 21:04:46 -0400 Message-ID: References: <61d4vlaatb.fsf@fencepost.gnu.org> <470EA52C.9030001@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1192151170 10073 80.91.229.12 (12 Oct 2007 01:06:10 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 12 Oct 2007 01:06:10 +0000 (UTC) Cc: emacs-unicode@gnu.org, emacs-devel@gnu.org, Miles Bader To: Jason Rumney Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 12 03:05:57 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Ig8xg-00078p-UZ for ged-emacs-devel@m.gmane.org; Fri, 12 Oct 2007 03:05:21 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ig8xa-0005BX-Ux for ged-emacs-devel@m.gmane.org; Thu, 11 Oct 2007 21:05:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ig8xX-0005BF-R9 for emacs-devel@gnu.org; Thu, 11 Oct 2007 21:04:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ig8xW-0005Ar-GS for emacs-devel@gnu.org; Thu, 11 Oct 2007 21:04:59 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ig8xW-0005Ao-Bd for emacs-devel@gnu.org; Thu, 11 Oct 2007 21:04:58 -0400 Original-Received: from tomts5.bellnexxia.net ([209.226.175.25] helo=tomts5-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ig8xM-0008Kf-Ha; Thu, 11 Oct 2007 21:04:48 -0400 Original-Received: from ceviche.home ([70.55.141.81]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20071012010447.IHCJ17217.tomts5-srv.bellnexxia.net@ceviche.home>; Thu, 11 Oct 2007 21:04:47 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id C5179B41BB; Thu, 11 Oct 2007 21:04:46 -0400 (EDT) In-Reply-To: <470EA52C.9030001@gnu.org> (Jason Rumney's message of "Thu\, 11 Oct 2007 23\:35\:24 +0100") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:80674 Archived-At: > Miles Bader wrote: >> M src/xdisp.c >> M src/coding.c >> > These two look like multi-tty wins - the only difference being that > global variables are replaced with members of the terminal struct. > The others are harder to judge, my approach would be to diff each one > with its branch point, and decide which has the simpler changes, then > try to manually apply the equivalent changes to the other branch's > version. encoded-kb.el seems to have been completely rewritten for > multi-tty, but the others look like the actual changes involved could be > quite simple. I'm looking into it. Stefan