;;; Functions for displaying various formats inline
;;;
(defun mm-inline-image-emacs (handle)
- (let ((b (point))
- (overlay nil)
- (string (copy-sequence "[MM-INLINED-IMAGE]"))
+ (let ((b (point-marker))
buffer-read-only)
(insert "\n")
- (buffer-name)
- (setq overlay (make-overlay (point) (point) (current-buffer)))
- (put-text-property 0 (length string) 'display (mm-get-image handle) string)
- (overlay-put overlay 'before-string string)
-
+ (put-image (mm-get-image handle) b)
(mm-handle-set-undisplayer
handle
- `(lambda ()
- (let (buffer-read-only)
- (delete-overlay ,overlay)
- (delete-region ,(set-marker (make-marker) b)
- ,(set-marker (make-marker) (point))))))))
+ `(lambda () (remove-images ,b (1+ ,b))))))
(defun mm-inline-image-xemacs (handle)
(let ((b (point))
(set-extent-property annot 'mm t)
(set-extent-property annot 'duplicable t)))
-(defun mm-inline-image (handle)
- (if mm-xemacs-p
- (mm-inline-image-xemacs handle)
- (mm-inline-image-emacs handle)))
+(eval-and-compile
+ (if (featurep 'xemacs)
+ (defalias 'mm-inline-image 'mm-inline-image-xemacs)
+ (defalias 'mm-inline-image 'mm-inline-image-emacs)))
(defvar mm-w3-setup nil)
(defun mm-setup-w3 ()
(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)))))
+ (setq charset (or (w3-coding-system-for-mime-charset
+ (buffer-substring-no-properties
+ (match-beginning 2)
+ (match-end 2)))
+ charset)))
(delete-region (point-min) (point-max))
(insert (mm-decode-string text charset))
(save-window-excursion
(save-restriction
(let ((w3-strict-width width)
+ ;; Don't let w3 set the global version of
+ ;; this variable.
+ (fill-column fill-column)
(url-standalone-mode t))
(condition-case var
(w3-region (point-min) (point-max))
(vcard-parse-string (mm-get-part handle)
'vcard-standard-filter))))))
(t
- (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))
+ (if (or (eq charset 'gnus-decoded)
+ ;; This is probably not entirely correct, but
+ ;; makes rfc822 parts with embedded multiparts work.
+ (eq mail-parse-charset 'gnus-decoded))
+ (save-restriction
+ (narrow-to-region (point) (point))
+ (mm-insert-part handle)
+ (goto-char (point-max)))
+ (insert (mm-decode-string (mm-get-part handle) charset)))
(when (and (equal type "plain")
(equal (cdr (assoc 'format (mm-handle-type handle)))
"flowed"))
(narrow-to-region b b)
(mm-insert-part handle)
(let (gnus-article-mime-handles
+ ;; disable prepare hook
+ gnus-article-prepare-hook
(gnus-newsgroup-charset
(or charset gnus-newsgroup-charset)))
(run-hooks 'gnus-article-decode-hook)
handle
`(lambda ()
(let (buffer-read-only)
- (condition-case nil
+ (if (fboundp 'remove-specifier)
;; This is only valid on XEmacs.
(mapcar (lambda (prop)
(remove-specifier
(face-property 'default prop) (current-buffer)))
- '(background background-pixmap foreground))
- (error nil))
+ '(background background-pixmap foreground)))
(delete-region ,(point-min-marker) ,(point-max-marker)))))))))
-(defun mm-display-patch-inline (handle)
+(defun mm-display-inline-fontify (handle mode)
(let (text)
(with-temp-buffer
(mm-insert-part handle)
- (diff-mode)
+ (funcall mode)
(font-lock-fontify-buffer)
(when (fboundp 'extent-list)
(map-extents (lambda (ext ignored)
(setq text (buffer-string)))
(mm-insert-inline handle text)))
+(defun mm-display-patch-inline (handle)
+ (mm-display-inline-fontify handle 'diff-mode))
+
+(defun mm-display-elisp-inline (handle)
+ (mm-display-inline-fontify handle 'emacs-lisp-mode))
+
(provide 'mm-view)
;; mm-view.el ends here