Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-23

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 113-118)

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

 * gnus--rel--5.10  (patch 38-39)

   - Update from CVS

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/gnus/mm-util.el
index 804a5b2,a7f375a..efb5aee
--- 1/lisp/gnus/mm-util.el
--- 2/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@@ -331,7 -331,7 +331,7 @@@ with Mule charsets.  It is completely u
          cs mime mule alist)
        (while css
        (setq cs (pop css)
-             mime (or (coding-system-get cs :mime-charset) ; Emacs 23
 -            mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode)
++            mime (or (coding-system-get cs :mime-charset); Emacs 23 (unicode)
                       (coding-system-get cs 'mime-charset)))
        (when (and mime
                   (not (eq t (setq mule

diff --cc src/ChangeLog
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge