Importing Pterodactyl Gnus v0.96.

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

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index a693aaa..4d00c52 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -38,9 +38,17 @@
 ;;;
 
 (defun mm-inline-image (handle)
-  (let ((annot (make-annotation (mm-get-image handle) nil 'text))
+  (let ((b (point))
+       (annot (make-annotation (mm-get-image handle) nil 'text))
        buffer-read-only)
-    (mm-insert-inline handle "\n")
+    (insert "\n")
+    (mm-handle-set-undisplayer
+     handle
+     `(lambda ()
+       (let (buffer-read-only)
+         (delete-annotation ,annot)
+         (delete-region ,(set-marker (make-marker) b)
+                        ,(set-marker (make-marker) (point))))))
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
@@ -55,7 +63,7 @@
     (setq mm-w3-setup t)))
 
 (defun mm-inline-text (handle)
-  (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
+  (let ((type (mm-handle-media-subtype handle))
        text buffer-read-only)
     (cond
      ((equal type "html")
@@ -65,23 +73,44 @@
            (url-standalone-mode t)
            (url-current-object
             (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
-           (width (window-width)))
+           (width (window-width))
+           (charset (mail-content-type-get
+                     (mm-handle-type handle) 'charset)))
        (save-excursion
          (insert text)
          (save-restriction
            (narrow-to-region b (point))
+           (goto-char (point-min))
+           (if (or (and (boundp 'w3-meta-content-type-charset-regexp)
+                        (re-search-forward
+                         w3-meta-content-type-charset-regexp nil t))
+                   (and (boundp 'w3-meta-charset-content-type-regexp)
+                        (re-search-forward
+                         w3-meta-charset-content-type-regexp nil t)))
+               (setq charset (w3-coding-system-for-mime-charset 
+                              (buffer-substring-no-properties 
+                               (match-beginning 2) 
+                               (match-end 2)))))
+           (delete-region (point-min) (point-max))
+           (insert (mm-decode-string text charset))
            (save-window-excursion
-             (let ((w3-strict-width width))
-               (w3-region (point-min) (point-max)))))
-         (mm-handle-set-undisplayer
-          handle
-          `(lambda ()
-             (let (buffer-read-only)
-              (mapc (lambda (prop)
-                     (remove-specifier
-                      (face-property 'default prop) (current-buffer)))
-                    '(background background-pixmap foreground))
-               (delete-region ,(point-min-marker) ,(point-max-marker))))))))
+             (save-restriction
+               (let ((w3-strict-width width)
+                     (url-standalone-mode t))
+                 (condition-case var
+                     (w3-region (point-min) (point-max))
+                   (error)))))
+           (mm-handle-set-undisplayer
+            handle
+            `(lambda ()
+               (let (buffer-read-only)
+                 (if (functionp 'remove-specifier)
+                     (mapc (lambda (prop)
+                             (remove-specifier
+                              (face-property 'default prop) (current-buffer)))
+                           '(background background-pixmap foreground)))
+                 (delete-region ,(point-min-marker)
+                                ,(point-max-marker)))))))))
      ((or (equal type "enriched")
          (equal type "richtext"))
       (save-excursion
@@ -133,14 +162,42 @@
 
 (defun mm-w3-prepare-buffer ()
   (require 'w3)
-  (w3-prepare-buffer))
+  (let ((url-standalone-mode t))
+    (w3-prepare-buffer)))
 
 (defun mm-view-message ()
+  (mm-enable-multibyte)
   (gnus-article-prepare-display)
   (run-hooks 'gnus-article-decode-hook)
   (fundamental-mode)
   (goto-char (point-min)))
 
+(defun mm-inline-message (handle)
+  (let ((b (point))
+       gnus-displaying-mime handles)
+    (save-excursion
+      (save-restriction
+       (narrow-to-region b b)
+       (mm-insert-part handle)
+       (let (gnus-article-mime-handles)
+         (run-hooks 'gnus-article-decode-hook)
+         (gnus-article-prepare-display)
+         (setq handles gnus-article-mime-handles))
+       (when handles
+         (setq gnus-article-mime-handles
+               (append gnus-article-mime-handles handles)))
+       (mm-handle-set-undisplayer
+        handle
+        `(lambda ()
+           (let (buffer-read-only)
+             (ignore-errors
+               ;; This is only valid on XEmacs.
+               (mapc (lambda (prop)
+                       (remove-specifier
+                        (face-property 'default prop) (current-buffer)))
+                     '(background background-pixmap foreground)))
+             (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
+
 (provide 'mm-view)
 
 ;; mm-view.el ends here