From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: unicode merge warning: src/w32select.c Date: Thu, 17 Feb 2005 19:34:09 -0500 Message-ID: <61oeeivh8e.fsf@fencepost.gnu.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1108687529 25513 80.91.229.2 (18 Feb 2005 00:45:29 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 18 Feb 2005 00:45:29 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 18 01:45:28 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1D1wG1-0006aa-UA for ged-emacs-devel@m.gmane.org; Fri, 18 Feb 2005 01:44:34 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D1wWG-0003j8-E7 for ged-emacs-devel@m.gmane.org; Thu, 17 Feb 2005 20:01:20 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1D1wTZ-0002pG-43 for emacs-devel@gnu.org; Thu, 17 Feb 2005 19:58:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1D1wTS-0002lw-9s for emacs-devel@gnu.org; Thu, 17 Feb 2005 19:58:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D1wTP-0002ZU-Iq for emacs-devel@gnu.org; Thu, 17 Feb 2005 19:58:23 -0500 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1D1wAR-0000ua-1T for emacs-devel@gnu.org; Thu, 17 Feb 2005 19:38:47 -0500 Original-Received: from miles by fencepost.gnu.org with local (Exim 4.34) id 1D1w5x-0006lu-V9; Thu, 17 Feb 2005 19:34:10 -0500 Original-To: emacs-unicode@gnu.org, Benjamin Riefenstahl , Jason Rumney System-Type: i686-pc-linux-gnu Blat: Foop 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 X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: main.gmane.org gmane.emacs.devel:33597 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:33597 In merging the CVS trunk changes into the unicode branch, there were many conflicts in src/w32select.c. I "forced" the patch to fit (by manually merging each hunk and ignoring seemingly minor differences between the trunk and the unicode branch) but I expect that the result won't be quite correct, so somebody with w32 knowledge should check out the unicode branch and make sure things are OK with the w32 selection code. At worst (if I totally mucked things up), the latest revision of src/w32select.c on the unicode branch could be backed out and Benjamin's patch from the trunk manually merged by somebody more knowledgeable. Thanks, -Miles -- My spirit felt washed. With blood. [Eli Shin, on "The Passion of the Christ"]