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

Patches applied:

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

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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge