From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: YAMAMOTO Mitsuharu Newsgroups: gmane.emacs.devel Subject: Re: rel-22 to trunk merge failure (macterm.c) 2008-02-04 Date: Mon, 04 Feb 2008 21:35:41 +0900 Organization: Faculty of Science, Chiba University Message-ID: References: <61zluhm43y.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1202128565 24804 80.91.229.12 (4 Feb 2008 12:36:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Feb 2008 12:36:05 +0000 (UTC) Cc: emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 04 13:36:27 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 1JM0Yg-0003D9-2N for ged-emacs-devel@m.gmane.org; Mon, 04 Feb 2008 13:36:22 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JM0YE-0005JS-2I for ged-emacs-devel@m.gmane.org; Mon, 04 Feb 2008 07:35:54 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JM0Y8-0005Gw-NH for emacs-devel@gnu.org; Mon, 04 Feb 2008 07:35:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JM0Y7-0005Ee-7h for emacs-devel@gnu.org; Mon, 04 Feb 2008 07:35:48 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JM0Y6-0005EQ-Rr for emacs-devel@gnu.org; Mon, 04 Feb 2008 07:35:46 -0500 Original-Received: from mathmail.math.s.chiba-u.ac.jp ([133.82.132.2]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JM0Y2-0007eQ-Uj; Mon, 04 Feb 2008 07:35:43 -0500 Original-Received: from church.math.s.chiba-u.ac.jp (church [133.82.132.36]) by mathmail.math.s.chiba-u.ac.jp (Postfix) with ESMTP id 784852C40; Mon, 4 Feb 2008 21:35:41 +0900 (JST) In-Reply-To: <61zluhm43y.fsf@fencepost.gnu.org> User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8 (=?ISO-8859-4?Q?Shij=F2?=) APEL/10.6 Emacs/23.0.50 (sparc-sun-solaris2.8) MULE/5.0 (SAKAKI) X-detected-kernel: by monty-python.gnu.org: NetBSD 3.0 (DF) 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:88156 Archived-At: >>>>> On Mon, 04 Feb 2008 05:02:25 -0500, Miles Bader said: > [Not all hunks failed, but I reverted the successful ones to avoid > too much inconsistency.] For Mac-specific files, rough merge is fine with me. I'm planning to do before-merge-multi-tty-to-trunk -> EMACS_22_BASE merge after the 22.2 release. And below is the plan after that (for Emacs 22): * Reorganize Carbon-specific code by separating its GUI parts into a new file `mactoolbox.c'. * Use Quartz 2D Image I/O API instead of QuickTime C API for reading images on Mac OS X 10.4 and later. * Add some event handlers to support dictionary lookup with DictionaryService (Command-Control-D, 10.4 and later). * Add (mostly GUI) code for the Carbon+AppKit port if it is allowed. YAMAMOTO Mitsuharu mituharu@math.s.chiba-u.ac.jp