Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

diff --cc src/xdisp.c
Simple merge