Merged from miles@gnu.org--gnu-2005 (patch 74-79, 332-349)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-336
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-338
   etc/emacs-buffer.gdb: Remove RCS keywords

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-348
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-74
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-79
   Update from CVS

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

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/help-fns.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge