all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
To: Miles Bader <miles@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: rel-22 to trunk merge failure (macterm.c)  2008-02-04
Date: Mon, 04 Feb 2008 21:35:41 +0900	[thread overview]
Message-ID: <wld4rc7vc2.wl%mituharu@math.s.chiba-u.ac.jp> (raw)
In-Reply-To: <61zluhm43y.fsf@fencepost.gnu.org>

>>>>> On Mon, 04 Feb 2008 05:02:25 -0500, Miles Bader <miles@gnu.org> 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




      reply	other threads:[~2008-02-04 12:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-04 10:02 rel-22 to trunk merge failure (macterm.c) 2008-02-04 Miles Bader
2008-02-04 12:35 ` YAMAMOTO Mitsuharu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=wld4rc7vc2.wl%mituharu@math.s.chiba-u.ac.jp \
    --to=mituharu@math.s.chiba-u.ac.jp \
    --cc=emacs-devel@gnu.org \
    --cc=miles@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.