Merged from miles@gnu.org--gnu-2005 (patch 656-658)

Patches applied:

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

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

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

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

diff --cc lisp/faces.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xfaces.c
Simple merge