Merged from miles@gnu.org--gnu-2005 (patch 204-213)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-204
   Clean up gdb-ui breakpoint faces

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

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

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

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

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

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/term/xterm.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge