(eval-and-compile
(autoload 'gnus-article-prepare-display "gnus-art")
(autoload 'vcard-parse-string "vcard")
- (autoload 'vcard-format-string "vcard"))
+ (autoload 'vcard-format-string "vcard")
+ (autoload 'diff-mode "diff-mode"))
;;;
;;; Functions for displaying various formats inline
;;;
(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)))
(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")
(save-restriction
(narrow-to-region b (point))
(goto-char (point-min))
- (if (or (re-search-forward w3-meta-content-type-charset-regexp nil t)
- (re-search-forward w3-meta-charset-content-type-regexp nil t))
+ (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)))))
- (mm-decode-body charset)
+ (delete-region (point-min) (point-max))
+ (insert (mm-decode-string text charset))
(save-window-excursion
- (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))))))))
+ (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
(defun mm-view-message ()
(mm-enable-multibyte)
- (gnus-article-prepare-display)
- (run-hooks 'gnus-article-decode-hook)
+ (let (handles)
+ (let (gnus-article-mime-handles)
+ ;; Double decode problem may happen. See mm-inline-message.
+ (run-hooks 'gnus-article-decode-hook)
+ (gnus-article-prepare-display)
+ (setq handles gnus-article-mime-handles))
+ (when handles
+ (setq gnus-article-mime-handles
+ (nconc gnus-article-mime-handles
+ (if (listp (car handles))
+ handles (list handles))))))
(fundamental-mode)
(goto-char (point-min)))
(defun mm-inline-message (handle)
- (let ((b (point)))
+ (let ((b (point))
+ (charset (mail-content-type-get
+ (mm-handle-type handle) 'charset))
+ gnus-displaying-mime handles)
(save-excursion
(save-restriction
(narrow-to-region b b)
(mm-insert-part handle)
- (run-hooks 'gnus-article-decode-hook)
- (gnus-article-prepare-display)
+ (let (gnus-article-mime-handles
+ (gnus-newsgroup-charset (or charset gnus-newsgroup-charset)))
+ (run-hooks 'gnus-article-decode-hook)
+ (gnus-article-prepare-display)
+ (setq handles gnus-article-mime-handles))
+ (goto-char (point-max))
+ (unless (bolp)
+ (insert "\n"))
+ (insert "----------\n\n")
+ (when handles
+ (setq gnus-article-mime-handles
+ (nconc gnus-article-mime-handles
+ (if (listp (car handles))
+ handles (list handles)))))
(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))
+ (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)))))))))
+(defun mm-display-patch-inline (handle)
+ (let (text)
+ (with-temp-buffer
+ (mm-insert-part handle)
+ (diff-mode)
+ (font-lock-fontify-buffer)
+ (when (fboundp 'extent-list)
+ (map-extents (lambda (ext ignored)
+ (set-extent-property ext 'duplicable t)
+ nil)
+ nil nil nil nil nil 'text-prop))
+ (setq text (buffer-string)))
+ (mm-insert-inline handle text)))
+
(provide 'mm-view)
;; mm-view.el ends here
projects / gnus / blobdiff