Merged from miles@gnu.org--gnu-2005 (patch 279-280)

Patches applied:

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

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

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

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

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/term/xterm.el
Simple merge

diff --cc src/fontset.c
Simple merge