2006-04-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>

[gnus] / lisp / mm-util.el

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 802ad86..83a7bfb 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -29,6 +29,13 @@
 (eval-when-compile (require 'cl))
 (require 'mail-prsvr)
 
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (unless (ignore-errors
+               (require 'timer-funcs))
+       (require 'timer))
+    (require 'timer)))
+
 (eval-and-compile
   (mapcar
    (lambda (elem)
@@ -502,7 +509,7 @@ used as the line break code type of the coding system.
 If ALLOW-OVERRIDE is given, use `mm-charset-override-alist' to
 map undesired charset names to their replacement.  This should
 only be used for decoding, not for encoding."
-  ;; OVERRIDE is used (only) in `mm-decode-body'.
+  ;; OVERRIDE is used (only) in `mm-decode-body' and `mm-decode-string'.
   (when (stringp charset)
     (setq charset (intern (downcase charset))))
   (when lbt
@@ -1210,7 +1217,7 @@ decompressed data.  The buffer's multibyteness must be turned off."
              (coding-system-for-write mm-binary-coding-system)
              retval err-msg)
          (message "%s" msg)
-         (with-temp-buffer
+         (mm-with-unibyte-buffer
            (insert-buffer-substring cur)
            (condition-case err
                (progn