From: Jason Rumney <jasonr@gnu.org>
To: Miles Bader <miles@gnu.org>
Cc: emacs-unicode@gnu.org, emacs-devel@gnu.org
Subject: Re: unicode merge failures 2007-10-12
Date: Thu, 11 Oct 2007 23:35:24 +0100 [thread overview]
Message-ID: <470EA52C.9030001@gnu.org> (raw)
In-Reply-To: <61d4vlaatb.fsf@fencepost.gnu.org>
Miles Bader wrote:
> M src/xdisp.c
> M src/coding.c
>
These two look like multi-tty wins - the only difference being that
global variables are replaced with members of the terminal struct.
The others are harder to judge, my approach would be to diff each one
with its branch point, and decide which has the simpler changes, then
try to manually apply the equivalent changes to the other branch's
version. encoded-kb.el seems to have been completely rewritten for
multi-tty, but the others look like the actual changes involved could be
quite simple.
next prev parent reply other threads:[~2007-10-11 22:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-11 16:13 unicode merge failures 2007-10-12 Miles Bader
2007-10-11 22:35 ` Jason Rumney [this message]
2007-10-12 1:04 ` Stefan Monnier
2007-10-12 4:05 ` Stefan Monnier
2007-10-12 17:43 ` Stefan Monnier
2007-10-12 21:30 ` Dan Nicolaescu
2007-10-12 21:51 ` Miles Bader
2007-10-12 22:12 ` Dan Nicolaescu
2007-10-16 23:04 ` James Cloos
2007-10-17 0:04 ` Andreas Schwab
2007-10-17 1:04 ` Kenichi Handa
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=470EA52C.9030001@gnu.org \
--to=jasonr@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=emacs-unicode@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).