Merged from miles@gnu.org--gnu-2005 (patch 438-440)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
   Rename vertical-divider face to vertical-border

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-440
   Change escape-glyph color on dark backgrounds back to cyan

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

diff --cc etc/TODO
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xfaces.c
Simple merge