From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.multi-tty,gmane.emacs.devel Subject: Re: Merging multitty Date: Sat, 12 May 2007 12:32:08 -0700 Message-ID: <200705121932.l4CJWDLx003326@oogie-boogie.ics.uci.edu> References: <2wmz0iriyj.fsf@fencepost.gnu.org> <87fy65k6eh.fsf@red-bean.com> <853b25lk43.fsf@lola.goethe.zz> <86bqgr3g1h.fsf_-_@lola.quinscape.zz> <4644355E.7070004@gnu.org> <867irf3cjo.fsf@lola.quinscape.zz> <464444AF.9070905@gnu.org> <4644DAA4.6090303@lorentey.hu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1178998523 22848 80.91.229.12 (12 May 2007 19:35:23 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 12 May 2007 19:35:23 +0000 (UTC) Cc: multi-tty@lists.fnord.hu, Karoly Lorentey , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: multi-tty-bounces@lists.fnord.hu Sat May 12 21:35:21 2007 Return-path: Envelope-to: gem-multi-tty@m.gmane.org Original-Received: from ninsei.hu ([212.92.23.158]) by lo.gmane.org with esmtp (Exim 4.50) id 1HmxN8-0005Mw-Ey for gem-multi-tty@m.gmane.org; Sat, 12 May 2007 21:35:18 +0200 Original-Received: from [127.0.0.1] (nixon [127.0.0.1]) by chatsubo.ninsei.hu (Postfix) with ESMTP id C69AD7901; Sat, 12 May 2007 21:35:16 +0200 (CEST) Original-Received: from oogie-boogie.ics.uci.edu (oogie-boogie.ics.uci.edu [128.195.1.41]) by chatsubo.ninsei.hu (Postfix) with ESMTP id 93F1E78FD for ; Sat, 12 May 2007 21:35:14 +0200 (CEST) Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id l4CJWDLx003326; Sat, 12 May 2007 12:32:13 -0700 (PDT) In-Reply-To: (Richard Stallman's message of "Sat\, 12 May 2007 12\:48\:01 -0400") Original-Lines: 45 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-BeenThere: multi-tty@lists.fnord.hu X-Mailman-Version: 2.1.9 Precedence: list List-Id: Discussions of multiple tty support in Emacs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: multi-tty-bounces@lists.fnord.hu Errors-To: multi-tty-bounces@lists.fnord.hu Xref: news.gmane.org gmane.emacs.multi-tty:691 gmane.emacs.devel:70919 Archived-At: Richard Stallman writes: > Fixing multi-tty on Windows and other platforms does not really need any > platform API experience: it's mostly a matter of understanding C > compiler error messages and changing references to previously global C > variables to their new terminal-local places (accessible via a frame > handle). If the code compiles successfully, it will likely work. > > Let's install this code in a branch in the Emacs repository > immediately. That way, other people with write access to our > repository can work on making it compile on other systems. > > Yes. If you guys decide to merge the Unicode branch first, I'll simply > devote a weekend to resolve merge conflicts and continue syncing with > the trunk as long as necessary. > > In that case, I agree we may as well merge the unicode-2 branch first. How about considering the size of the code to merge before making a decision? For multi-tty the diffstat summary for the diff between multi-tty and CVS HEAD is: (I tried to exclude all the generated files, from the diff) 89 files changed, 5200 insertions(+), 2374 deletions(-) For multi-tty a lot of the changes are mechanical: adding an extra parameter to some function calls, adding an extra level of indirection, etc. For the emacs-unicode-2 the diffstat summary is: 271 files changed, 29930 insertions(+), 26730 deletions(-) For multi-tty there have not been any reports of crashes in a long time (more than a 1 1/2 years if I recall correctly). Given that multi-tty is a much smaller change, and it touches a much smaller area of emacs and that the unicode branch is a much more fundamental change, it should be easier to stabilize the trunk after merging multi-tty. So, IMHO, it would be more efficient to first merge multi-tty and after that the unicode branch.