*** empty log message ***

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 74a4703..75cb51b 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -45,7 +45,7 @@
     (w3-do-setup)
     (require 'url)
     (require 'w3-vars)
-    (load "url-misc.el")
+    (require 'url-vars)
     (setq mm-w3-setup t)))
 
 (defun mm-inline-text (handle)
@@ -54,20 +54,17 @@
     (cond
      ((equal type "plain")
       (setq text (mm-get-part handle))
-      (let ((b (point)))
-       (insert text)
+      (let ((b (point))
+           (charset (mail-content-type-get
+                     (mm-handle-type handle) 'charset)))
+       (insert (mm-decode-string text charset))
        (save-restriction
          (narrow-to-region b (point))
-         (let ((charset (mail-content-type-get
-                         (mm-handle-type handle) 'charset)))
-           (mm-decode-body charset nil))
          (mm-handle-set-undisplayer
           handle
           `(lambda ()
              (let (buffer-read-only)
-               (delete-region
-                ,(set-marker (make-marker) (point-min))
-                ,(set-marker (make-marker) (point-max)))))))))
+               (delete-region ,(point-min-marker) ,(point-max-marker))))))))
      ((equal type "html")
       (mm-setup-w3)
       (setq text (mm-get-part handle))
@@ -84,9 +81,11 @@
           handle
           `(lambda ()