Merged in changes from CVS HEAD

Merged in changes from CVS HEAD

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
   src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert

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

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