Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-50

Merge from emacs--cvs-trunk--0

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41
   Update from CVS

diff --cc lisp/edmacro.el
Simple merge

diff --cc lisp/gnus/gnus-sum.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/textmodes/tex-mode.el
Simple merge

diff --cc src/fileio.c
Simple merge