Merged in changes from CVS trunk.

Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-268
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-269
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-270
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-271
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-272
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-273
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
   Update from CVS: man/makefile.w32-in: Revert last change

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-277
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-278
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-279
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-280
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-281
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-282
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-283
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-284
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-285
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-286
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-157