Merged from emacs@sv.gnu.org

Patches applied:

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-587
   Update from erc--emacs--22

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

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

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

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

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

diff --cc configure.in
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/progmodes/ebrowse.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lwlib/xlwmenu.c
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/window.c
Simple merge