Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 241-257)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 59-65)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - (mm-string-to-multibyte): Use Gnus trunk definition.

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/arc-mode.el
Simple merge

diff --cc lisp/emacs-lisp/generic.el
Simple merge

diff --cc lisp/faces.el
Simple merge

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

diff --cc lisp/gnus/mm-util.el
Simple merge

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

diff --cc lisp/makefile.w32-in
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/term/mac-win.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge