*** empty log message ***

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index cde7ba6..b81c78b 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -28,6 +28,11 @@
 (require 'mm-bodies)
 (require 'mm-decode)
 
+(eval-and-compile
+  (autoload 'gnus-article-prepare-display "gnus-art")
+  (autoload 'vcard-parse-string "vcard")
+  (autoload 'vcard-format-string "vcard"))
+
 ;;;
 ;;; Functions for displaying various formats inline
 ;;;
@@ -66,17 +71,20 @@
          (save-restriction
            (narrow-to-region b (point))
            (save-window-excursion
-             (let ((w3-strict-width width))
+             (let ((w3-strict-width width)
+                   (url-standalone-mode t))
                (w3-region (point-min) (point-max)))))
+         (narrow-to-region (1+ (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))))))))
+               (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
@@ -86,6 +94,13 @@
            (enriched-decode (point-min) (point-max))
            (setq text (buffer-string)))))
       (mm-insert-inline handle text))
+     ((equal type "x-vcard")
+      (mm-insert-inline
+       handle
+       (concat "\n-- \n"
+              (vcard-format-string
+               (vcard-parse-string (mm-get-part handle)
+                                   'vcard-standard-filter)))))
      (t
       (setq text (mm-get-part handle))
       (let ((b (point))
@@ -112,7 +127,7 @@
        (let (buffer-read-only)
          (delete-region ,(set-marker (make-marker) b)
                         ,(set-marker (make-marker) (point))))))))
-  
+
 (defun mm-inline-audio (handle)
   (message "Not implemented"))
 
@@ -121,17 +136,34 @@
 
 (defun mm-w3-prepare-buffer ()
   (require 'w3)
-  (w3-prepare-buffer))
-
-(eval-and-compile
-  (autoload 'gnus-article-prepare-display "gnus-art"))
+  (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)))
+    (save-excursion
+      (save-restriction
+       (narrow-to-region b b)
+       (mm-insert-part handle)
+       (run-hooks 'gnus-article-decode-hook)
+       (gnus-article-prepare-display)
+       (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)))))))))
+
 (provide 'mm-view)
 
 ;; mm-view.el ends here