unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* unicode merge warning:  src/w32select.c
@ 2005-02-18  0:34 Miles Bader
  0 siblings, 0 replies; only message in thread
From: Miles Bader @ 2005-02-18  0:34 UTC (permalink / raw)
  Cc: emacs-devel

In merging the CVS trunk changes into the unicode branch, there were many
conflicts in src/w32select.c.

I "forced" the patch to fit (by manually merging each hunk and ignoring
seemingly minor differences between the trunk and the unicode branch) but I
expect that the result won't be quite correct, so somebody with w32 knowledge
should check out the unicode branch and make sure things are OK with the w32
selection code.

At worst (if I totally mucked things up), the latest revision of
src/w32select.c on the unicode branch could be backed out and Benjamin's
patch from the trunk manually merged by somebody more knowledgeable.

Thanks,

-Miles
-- 
My spirit felt washed.  With blood.  [Eli Shin, on "The Passion of the Christ"]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-02-18  0:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-18  0:34 unicode merge warning: src/w32select.c Miles Bader

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).