Importing pgnus-0.71

[elisp/gnus.git-] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index ccc513c..cde7ba6 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- Functions for viewing MIME objects
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -35,42 +35,31 @@
 (defun mm-inline-image (handle)
   (let ((annot (make-annotation (mm-get-image handle) nil 'text))
        buffer-read-only)
-    (mm-insert-inline handle ".\n")
+    (mm-insert-inline handle "\n")
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
 (defvar mm-w3-setup nil)
 (defun mm-setup-w3 ()
   (unless mm-w3-setup
+    (require 'w3)
     (w3-do-setup)
     (require 'url)
     (require 'w3-vars)
-    (condition-case ()
-       (load "url-misc.el")
-      (error nil))
+    (require 'url-vars)
     (setq mm-w3-setup t)))
 
 (defun mm-inline-text (handle)
   (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
        text buffer-read-only)
     (cond
-     ((equal type "plain")
-      (setq text (mm-get-part handle))
-      (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))
-         (mm-handle-set-undisplayer
-          handle
-          `(lambda ()
-             (let (buffer-read-only)
-               (delete-region ,(point-min-marker) ,(point-max-marker))))))))
      ((equal type "html")
       (mm-setup-w3)
       (setq text (mm-get-part handle))
       (let ((b (point))
+           (url-standalone-mode t)
+           (url-current-object
+            (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
            (width (window-width)))
        (save-excursion
          (insert text)
@@ -92,23 +81,26 @@
          (equal type "richtext"))
       (save-excursion
        (mm-with-unibyte-buffer
-         (insert-buffer-substring (mm-handle-buffer handle))
-         (mm-decode-content-transfer-encoding
-          (mm-handle-encoding handle)
-          (car (mm-handle-type handle)))
+         (mm-insert-part handle)
          (save-window-excursion
            (enriched-decode (point-min) (point-max))
            (setq text (buffer-string)))))
       (mm-insert-inline handle text))
      (t
-      (save-excursion
-       (mm-with-unibyte-buffer
-         (insert-buffer-substring (mm-handle-buffer handle))
-         (mm-decode-content-transfer-encoding
-          (mm-handle-encoding handle)
-          (car (mm-handle-type handle)))
-         (setq text (buffer-string))))
-      (mm-insert-inline handle text)))))
+      (setq text (mm-get-part handle))
+      (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))
+         (set-text-properties (point-min) (point-max) nil)
+         (mm-handle-set-undisplayer
+          handle
+          `(lambda ()
+             (let (buffer-read-only)
+               (delete-region ,(point-min-marker)
+                              ,(point-max-marker)))))))))))
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."
@@ -131,6 +123,15 @@
   (require 'w3)
   (w3-prepare-buffer))
 
+(eval-and-compile
+  (autoload 'gnus-article-prepare-display "gnus-art"))
+
+(defun mm-view-message ()
+  (gnus-article-prepare-display)
+  (run-hooks 'gnus-article-decode-hook)
+  (fundamental-mode)
+  (goto-char (point-min)))
+
 (provide 'mm-view)
 
 ;; mm-view.el ends here