Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)

Patches applied:

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
   Collapse feature addition/removal within single ChangeLog entry

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

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

diff --cc src/emacs.c
Simple merge

diff --cc src/xdisp.c
Simple merge