Merged from miles@gnu.org--gnu-2005 (patch 31-33, 129-141)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-133
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-139
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-31
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-32
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-33
   Update from CVS

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

diff --cc src/dispextern.h
Simple merge

diff --cc src/xdisp.c
Simple merge