- (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
- buffer-read-only image)
- (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 image (make-image-specifier
- (vector (intern type) :data (buffer-string)))))
- (let ((annot (make-annotation image nil 'text)))
- (set-extent-property annot 'mm t)
- (set-extent-property annot 'duplicable t)
- (mm-handle-set-undisplayer handle annot))
- (insert " ")))
+ (let ((annot (make-annotation (mm-get-image handle) nil 'text))
+ buffer-read-only)
+ (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)
+ (require 'url-vars)
+ (setq mm-w3-setup t)))