From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: Possible merge conflict in src/macterm.[ch] Date: Tue, 29 Jan 2008 14:19:53 +0900 Message-ID: References: <61lk6hwgnc.fsf@fencepost.gnu.org> <479D00C6.8040905@fgznet.ch> <479E2446.5060100@fgznet.ch> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1201584037 20422 80.91.229.12 (29 Jan 2008 05:20:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 29 Jan 2008 05:20:37 +0000 (UTC) Cc: YAMAMOTO Mitsuharu , emacs-devel@gnu.org To: Andreas Tobler Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 29 06:20:56 2008 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 1JJitz-0004sT-IS for ged-emacs-devel@m.gmane.org; Tue, 29 Jan 2008 06:20:55 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JJitY-0000nN-DZ for ged-emacs-devel@m.gmane.org; Tue, 29 Jan 2008 00:20:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JJitT-0000mW-DS for emacs-devel@gnu.org; Tue, 29 Jan 2008 00:20:23 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JJitO-0000jO-JA for emacs-devel@gnu.org; Tue, 29 Jan 2008 00:20:22 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JJitO-0000jG-6D for emacs-devel@gnu.org; Tue, 29 Jan 2008 00:20:18 -0500 Original-Received: from tyo201.gate.nec.co.jp ([202.32.8.193]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JJitK-0004MM-Oa; Tue, 29 Jan 2008 00:20:15 -0500 Original-Received: from relay11.aps.necel.com ([10.29.19.46]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id m0T5JdRr007905; Tue, 29 Jan 2008 14:19:54 +0900 (JST) Original-Received: from relay21.aps.necel.com ([10.29.19.20] [10.29.19.20]) by relay11.aps.necel.com with ESMTP; Tue, 29 Jan 2008 14:19:54 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.112.215] [10.114.112.215]) by relay21.aps.necel.com with ESMTP; Tue, 29 Jan 2008 14:19:54 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id E46B54B; Tue, 29 Jan 2008 14:19:53 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <479E2446.5060100@fgznet.ch> (Andreas Tobler's message of "Mon, 28 Jan 2008 19:51:50 +0100") Original-Lines: 14 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:87739 Archived-At: Andreas Tobler writes: > This one fixes bootstrap on OS-X 10.5.1 for me: > > Index: macterm.c Thanks! [I received an identical patch from Yuji Yamano ] -Miles -- The car has become... an article of dress without which we feel uncertain, unclad, and incomplete. [Marshall McLuhan, Understanding Media, 1964]