Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

diff --cc lisp/subr.el
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/window.c
Simple merge