Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/vc-rcs.el
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xfaces.c
Simple merge