From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: unicode merge failures 2007-10-12 Date: Thu, 11 Oct 2007 23:35:24 +0100 Message-ID: <470EA52C.9030001@gnu.org> References: <61d4vlaatb.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1192142154 20621 80.91.229.12 (11 Oct 2007 22:35:54 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 11 Oct 2007 22:35:54 +0000 (UTC) Cc: emacs-unicode@gnu.org, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 12 00:35:52 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 1Ig6dC-0001IY-PA for ged-emacs-devel@m.gmane.org; Fri, 12 Oct 2007 00:35:51 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ig6d6-0005rX-K5 for ged-emacs-devel@m.gmane.org; Thu, 11 Oct 2007 18:35:44 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ig6d3-0005rJ-Q1 for emacs-devel@gnu.org; Thu, 11 Oct 2007 18:35:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ig6d1-0005qm-Tv for emacs-devel@gnu.org; Thu, 11 Oct 2007 18:35:40 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ig6d1-0005qj-RI for emacs-devel@gnu.org; Thu, 11 Oct 2007 18:35:39 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ig6cu-0008LF-Jj; Thu, 11 Oct 2007 18:35:32 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id DAA595125C; Thu, 11 Oct 2007 23:35:31 +0100 (BST) User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) In-Reply-To: <61d4vlaatb.fsf@fencepost.gnu.org> X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 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:80664 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.