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

Patches applied:

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

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

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

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

diff --cc configure.in
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge