Synch to Oort Gnus 200304061231.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0393170..ab89fa2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2003-04-06  Jesper Harder  <harder@ifa.au.dk>
 
+       * mm-bodies.el (mm-decode-body): last-coding-system-used doesn't
+       exist in XEmacs.
+       (mm-decode-body): Add missing quote.
+
        * mm-uu.el (mm-uu-pgp-signed-extract-1): Set
        buffer-file-coding-system.
 
@@ -18,7 +22,7 @@
        (pgg-pgp5-snarf-keys-region, pgg-pgp5-process-region): do.
 
        * pgg.el (pgg-make-temp-file, pgg-temporary-file-directory): do.
-
+       
 2003-04-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-split): (save-excursion) around (widen)

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index ebadc4d..5d4e132 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -276,8 +276,11 @@ use the supplied charset unconditionally."
              (mm-decode-coding-region (point-min) (point-max)
                                              coding-system)
            (mm-decode-coding-region-safely (point-min) (point-max)
-                                           coding-system))))
-      (setq buffer-file-coding-system last-coding-system-used))))
+                                           coding-system)))
+       (setq buffer-file-coding-system
+             (if (boundp 'last-coding-system-used)
+                 last-coding-system-used
+               coding-system))))))
 
 (defun mm-decode-coding-region-safely (start end coding-system)
   "Decode region between START and END with CODING-SYSTEM.