Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)

Patches applied:

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

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

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

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

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

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xmenu.c
Simple merge