Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-116
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-117
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-118
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-119
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-38
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-39
   Update from CVS

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

diff --cc src/dispnew.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/macterm.c
Simple merge