Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

diff --cc lisp/faces.el
Simple merge

diff --cc src/xdisp.c
Simple merge