Merged from miles@gnu.org--gnu-2005 (patch 307-312)

Patches applied:

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

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

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

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

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

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

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

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge