Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-171
   Update from CVS: man/mh-e.texi (Folders): Various edits.

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

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

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

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

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

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

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc man/emacs.texi
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge