;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
(defvar mm-text-html-renderer-alist
'((w3 . mm-inline-text-html-render-with-w3)
(w3m . mm-inline-text-html-render-with-w3m)
+ (w3m-standalone mm-inline-render-with-stdin nil
+ "w3m" "-dump" "-T" "text/html")
(links mm-inline-render-with-file
mm-links-remove-leading-blank
"links" "-dump" file)
(lynx mm-inline-render-with-stdin nil
- "lynx" "-dump" "-force_html" "-stdin")
+ "lynx" "-dump" "-force_html" "-stdin" "-nolist")
(html2text mm-inline-render-with-function html2text))
"The attributes of renderer types for text/html.")
(defvar mm-text-html-washer-alist
'((w3 . gnus-article-wash-html-with-w3)
(w3m . gnus-article-wash-html-with-w3m)
+ (w3m-standalone mm-inline-render-with-stdin nil
+ "w3m" "-dump" "-T" "text/html")
(links mm-inline-wash-with-file
mm-links-remove-leading-blank
"links" "-dump" file)
(lynx mm-inline-wash-with-stdin nil
- "lynx" "-dump" "-force_html" "-stdin")
+ "lynx" "-dump" "-force_html" "-stdin" "-nolist")
(html2text html2text))
"The attributes of washer types for text/html.")
(defun mm-inline-image-emacs (handle)
(let ((b (point-marker))
buffer-read-only)
- (insert "\n")
(put-image (mm-get-image handle) b)
+ (insert "\n\n")
(mm-handle-set-undisplayer
handle
- `(lambda () (remove-images ,b (1+ ,b))))))
+ `(lambda ()
+ (let ((b ,b)
+ buffer-read-only)
+ (remove-images b b)
+ (delete-region b (+ b 2)))))))
(defun mm-inline-image-xemacs (handle)
- (insert "\n")
- (forward-char -1)
- (let ((b (point))
- (annot (make-annotation (mm-get-image handle) nil 'text))
+ (insert "\n\n")
+ (forward-char -2)
+ (let ((annot (make-annotation (mm-get-image handle) nil 'text))
buffer-read-only)
(mm-handle-set-undisplayer
handle
`(lambda ()
- (let (buffer-read-only)
+ (let ((b ,(point-marker))
+ buffer-read-only)
(delete-annotation ,annot)
- (delete-region ,(set-marker (make-marker) b)
- ,(set-marker (make-marker) (point))))))
+ (delete-region (- b 2) b))))
(set-extent-property annot 'mm t)
(set-extent-property annot 'duplicable t)))
;; Don't let w3 set the global version of
;; this variable.
(fill-column fill-column))
- (condition-case ()
+ (if (or debug-on-error debug-on-quit)
(w3-region (point-min) (point-max))
- (error
- (delete-region (point-min) (point-max))
- (let ((b (point))
- (charset (mail-content-type-get
- (mm-handle-type handle) 'charset)))
- (if (or (eq charset 'gnus-decoded)
- (eq mail-parse-charset 'gnus-decoded))
+ (condition-case ()
+ (w3-region (point-min) (point-max))
+ (error
+ (delete-region (point-min) (point-max))
+ (let ((b (point))
+ (charset (mail-content-type-get
+ (mm-handle-type handle) 'charset)))
+ (if (or (eq charset 'gnus-decoded)
+ (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))))
- (message
- "Error while rendering html; showing as text/plain"))))))
+ (insert (mm-decode-string (mm-get-part handle)
+ charset))))
+ (message
+ "Error while rendering html; showing as text/plain")))))))
(mm-handle-set-undisplayer
handle
`(lambda ()
(delete-region ,(point-min-marker)
,(point-max-marker)))))))))
-(defvar mm-w3m-mode-map nil
- "Local keymap for inlined text/html part rendered by emacs-w3m. It will
-be different from `w3m-mode-map' to use in the article buffer.")
-
-(defvar mm-w3m-mode-command-alist
- '((backward-char)
- (describe-mode)
- (forward-char)
- (goto-line)
- (next-line)
- (previous-line)
- (w3m-antenna)
- (w3m-antenna-add-current-url)
- (w3m-bookmark-add-current-url)
- (w3m-bookmark-add-this-url)
- (w3m-bookmark-view)
- (w3m-close-window)
- (w3m-copy-buffer)
- (w3m-delete-buffer)
- (w3m-dtree)
- (w3m-edit-current-url)
- (w3m-edit-this-url)
- (w3m-gohome)
- (w3m-goto-url)
- (w3m-goto-url-new-session)
- (w3m-history)
- (w3m-history-restore-position)
- (w3m-history-store-position)
- (w3m-namazu)
- (w3m-next-buffer)
- (w3m-previous-buffer)
- (w3m-quit)
- (w3m-redisplay-with-charset)
- (w3m-reload-this-page)
- (w3m-scroll-down-or-previous-url)
- (w3m-scroll-up-or-next-url)
- (w3m-search)
- (w3m-select-buffer)
- (w3m-switch-buffer)
- (w3m-view-header)
- (w3m-view-parent-page)
- (w3m-view-previous-page)
- (w3m-view-source)
- (w3m-weather))
- "Alist of commands to use for emacs-w3m in the article buffer. Each
-element looks like (FROM-COMMAND . TO-COMMAND); FROM-COMMAND should be
-registered in `w3m-mode-map' which will be substituted by TO-COMMAND
-in `mm-w3m-mode-map'. If TO-COMMAND is nil, an article command key
-will not be substituted.")
-
-(defvar mm-w3m-mode-dont-bind-keys (list [up] [right] [left] [down])
- "List of keys which should not be bound for the emacs-w3m commands.")
-
(defvar mm-w3m-setup nil
"Whether gnus-article-mode has been setup to use emacs-w3m.")
"Setup gnus-article-mode to use emacs-w3m."
(unless mm-w3m-setup
(require 'w3m)
- (unless mm-w3m-mode-map
- (setq mm-w3m-mode-map (copy-keymap w3m-mode-map))
- (dolist (def mm-w3m-mode-command-alist)
- (condition-case nil
- (substitute-key-definition (car def) (cdr def) mm-w3m-mode-map)
- (error)))
- (dolist (key mm-w3m-mode-dont-bind-keys)
- (condition-case nil
- (define-key mm-w3m-mode-map key nil)
- (error))))
(unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist)
(push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)
w3m-cid-retrieve-function-alist))
- (setq mm-w3m-setup t)))
+ (setq mm-w3m-setup t))
+ (setq w3m-display-inline-images mm-inline-text-html-with-images))
(defun mm-w3m-cid-retrieve (url &rest args)
"Insert a content pointed by URL if it has the cid: scheme."
(mm-insert-part handle)
(throw 'found-handle (mm-handle-media-type handle)))))))
+(eval-and-compile
+ (unless (or (featurep 'xemacs)
+ (>= emacs-major-version 21))
+ (defvar mm-w3m-mode-map nil
+ "Keymap for text/html parts rendered by emacs-w3m.
+This keymap will be bound only when Emacs 20 is running and overwritten
+by the value of `w3m-minor-mode-map'. In order to add some commands to
+this keymap, add them to `w3m-minor-mode-map' instead of this keymap.")))
+
+(defun mm-w3m-local-map-property ()
+ (when (and (boundp 'w3m-minor-mode-map) w3m-minor-mode-map)
+ (if (or (featurep 'xemacs)
+ (>= emacs-major-version 21))
+ (list 'keymap w3m-minor-mode-map)
+ (list 'local-map
+ (or mm-w3m-mode-map
+ (progn
+ (setq mm-w3m-mode-map (copy-keymap w3m-minor-mode-map))
+ (set-keymap-parent mm-w3m-mode-map gnus-article-mode-map)
+ mm-w3m-mode-map))))))
+
(defun mm-inline-text-html-render-with-w3m (handle)
"Render a text/html part using emacs-w3m."
(mm-setup-w3m)
(when charset
(delete-region (point-min) (point-max))
(insert (mm-decode-string text charset)))
- (let ((w3m-safe-url-regexp (if mm-inline-text-html-with-images
- nil
- "\\`cid:"))
- (w3m-display-inline-images mm-inline-text-html-with-images)
+ (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
w3m-force-redisplay)
(w3m-region (point-min) (point-max)))
(when mm-inline-text-html-with-w3m-keymap
(add-text-properties
(point-min) (point-max)
- (append '(mm-inline-text-html-with-w3m t)
- (gnus-local-map-property mm-w3m-mode-map)))))
+ (nconc (mm-w3m-local-map-property)
+ ;; Put the mark meaning this part was rendered by emacs-w3m.
+ '(mm-inline-text-html-with-w3m t)))))
(mm-handle-set-undisplayer
handle
`(lambda ()
(if entry
(setq func (cdr entry)))
(cond
- ((gnus-functionp func)
+ ((functionp func)
(funcall func handle))
(t
(apply (car func) handle (cdr func))))))
(set-text-properties (point-min) (point-max) nil)
(when (or (equal type "enriched")
(equal type "richtext"))
- (enriched-decode (point-min) (point-max)))
+ (ignore-errors
+ (enriched-decode (point-min) (point-max))))
(mm-handle-set-undisplayer
handle
`(lambda ()
gnus-article-prepare-hook
(gnus-newsgroup-charset
(or charset gnus-newsgroup-charset)))
- (run-hooks 'gnus-article-decode-hook)
+ (let ((gnus-original-article-buffer (mm-handle-buffer handle)))
+ (run-hooks 'gnus-article-decode-hook))
(gnus-article-prepare-display)
(setq handles gnus-article-mime-handles))
(goto-char (point-min))
(sit-for 1)
t)
+(autoload 'gnus-completing-read-maybe-default "gnus-util" nil nil 'macro)
+
(defun mm-view-pkcs7-decrypt (handle)
- (insert-buffer (mm-handle-buffer handle))
+ (insert-buffer-substring (mm-handle-buffer handle))
(goto-char (point-min))
(insert "MIME-Version: 1.0\n")
(mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
(if (= (length smime-keys) 1)
(cadar smime-keys)
(smime-get-key-by-email
- (completing-read
+ (gnus-completing-read-maybe-default
(concat "Decipher using which key? "
(if smime-keys (concat "(default " (caar smime-keys) ") ")
""))
projects / gnus / blobdiff