[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: rel-22 to trunk merge failure (macterm.c) 2008-02-04
From: |
YAMAMOTO Mitsuharu |
Subject: |
Re: rel-22 to trunk merge failure (macterm.c) 2008-02-04 |
Date: |
Mon, 04 Feb 2008 21:35:41 +0900 |
User-agent: |
Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8 (Shijō) APEL/10.6 Emacs/23.0.50 (sparc-sun-solaris2.8) MULE/5.0 (SAKAKI) |
>>>>> On Mon, 04 Feb 2008 05:02:25 -0500, Miles Bader <address@hidden> 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
address@hidden