Merged in changes from CVS trunk.

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
   src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected

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

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

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

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

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

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

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

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

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/xfaces.c
Simple merge