tm 7.20.
[elisp/tm.git] / tm-view.el
index 2532c65..88dd0c6 100644 (file)
@@ -1,53 +1,40 @@
 ;;;
-;;; A MIME viewer for GNU Emacs
+;;; tm-view.el --- interactive MIME viewer for GNU Emacs
 ;;;
-;;; by Morioka Tomohiko, 1994/07/13
-
-(provide 'tm-view)
-
-
-;;; @ require modules
+;;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;;
+;;; Author:   MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Keywords: mail, news, MIME, multimedia
+;;;
+;;; This file is part of tm (Tools for MIME).
 ;;;
 
 (require 'tl-str)
 (require 'tl-list)
-(require 'tl-header)
-(require 'tiny-mime)
-(require 'tm-misc)
+(require 'tl-atype)
+(require 'tl-misc)
+(require 'tl-822)
+(require 'mel)
+(require 'tm-ew-d)
+(require 'tm-def)
+(require 'tm-parse)
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.10 1995/03/14 12:39:41 morioka Exp $")
+  "$Id: tm-view.el,v 7.20 1995/10/24 00:21:02 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
 
 
-;;; @ constants
-;;;
-
-(defconst mime/tspecials "\000-\040()<>@,;:\\\"/[\093?.=")
-(defconst mime/token-regexp
-  (concat "[^" mime/tspecials "]*"))
-(defconst mime/content-type-subtype-regexp
-  (concat mime/token-regexp "/" mime/token-regexp))
-(defconst mime/content-parameter-value-regexp
-  (concat "\\("
-         message/quoted-string-regexp
-         "\\|[^; \t\n]*\\)"))
-
-(defconst mime/output-buffer-name "*MIME-out*")
-(defconst mime/decoding-buffer-name "*MIME-decoding*")
-
-
 ;;; @ variables
 ;;;
 
 (defvar mime/content-decoding-condition
-;;(setq mime/content-decoding-condition
   '(((type . "text/plain")
      (method "tm-plain" nil 'file 'type 'encoding 'mode 'name))
     ;;((type . "text/x-latex")
     ;;        "-e" "showexternal"
     ;;         'file '"access-type" '"name" '"site" '"directory"))
     ((type . "message/partial")
-     (method . mime/decode-message/partial-region))
+     (method . mime-article/decode-message/partial))
     ((method "metamail" t
             "-m" "tm" "-x" "-d" "-z" "-e" 'file)(mode . "play"))
+    ((method "tm-file"  nil 'file 'type 'encoding 'mode 'name)
+     (mode . "extract"))
     ))
 
-(defvar mime-viewer/content-filter-alist
-  '(("text/plain" . mime-viewer/filter-text/plain)))
+(defvar mime-viewer/childrens-header-showing-Content-Type-list
+  '("message/rfc822" "message/news"))
 
-(defvar mime-viewer/content-subject-function
-  (function
-   (lambda (cnum subj ctype params)
-     (insert
-      (format "[%s %s (%s)]\n"
-             (if (listp cnum)
-                 (mapconcat (function
-                             (lambda (num)
-                               (format "%s" (+ num 1))
-                               ))
-                            cnum ".")
-               "0")
-             subj ctype))
-     )))
-
-(defvar mime-viewer/content-header-filter-function
-  (function mime-viewer/default-content-header-filter-function))
+(defvar mime-viewer/default-showing-Content-Type-list
+  '("text/plain" "text/richtext" "text/enriched"
+    "text/x-latex" "application/x-latex"
+    "application/octet-stream" nil
+    "application/pgp"
+    "application/x-selection" "application/x-comment"))
 
-(defvar mime-viewer/childrens-header-showing-Content-Type-list
-  '("message/rfc822"))
+(defvar mime-viewer/content-subject-omitting-Content-Type-list
+  '("application/x-selection"))
+
+(defvar mime-viewer/uuencode-encoding-name-list '("x-uue" "x-uuencode"))
 
 (defvar mime-viewer/ignored-field-list
-  '("Received"))
+  '("Received" "Return-Path" "Replied" "Errors-To"
+    "Lines" "Sender" "Path" "Nntp-Posting-Host"
+    "Content-Type" "Precedence" "X-Face"))
+
+(defvar mime-viewer/ignored-field-regexp)
+
+(defvar mime-viewer/announcement-for-message/partial
+  (if (and (>= emacs-major-version 19) window-system)
+      "\
+\[[ This is message/partial style split message. ]]
+\[[ Please press `v' key in this buffer          ]]
+\[[ or click here by mouse button-2.             ]]"
+    "\
+\[[ This is message/partial style split message. ]]
+\[[ Please press `v' key in this buffer.         ]]"
+    ))
 
-(defun mime-viewer/default-content-header-filter-function (cnum cinfo)
-  (if (and (listp cnum)
-          (not (member
-                (mime::content-info/type
-                 (mime::article/get-content-region (butlast cnum) cinfo)
-                 )
-                mime-viewer/childrens-header-showing-Content-Type-list)
-               ))
-      (delete-region (goto-char (point-min))
-                    (or (and (re-search-forward "^$" nil t)
-                             (match-end 0))
-                        (point-max))
-                    )
-    (save-excursion
-      (save-restriction
-       (narrow-to-region (goto-char (point-min))
-                         (or (and (re-search-forward "^$" nil t)
-                                  (match-end 0))
-                             (point-max))
-                         )
-       (mapcar (function
-                (lambda (field)
-                  (goto-char (point-min))
-                  (while (and (re-search-forward
-                               (concat "^" (regexp-quote field) ":")
-                               nil t)
-                              (progn
-                                (delete-region
-                                 (match-beginning 0)
-                                 (and
-                                  (re-search-forward
-                                   (concat message/field-body-regexp "\n")
-                                   nil t)
-                                  (match-end 0)
-                                  ))
-                                t))
-                    )
-                  )) mime-viewer/ignored-field-list)
-       ))))
 
-(defvar mime-viewer/default-showing-Content-Type-list
-  '("text/plain" "text/richtext" "text/enriched"
-    "text/x-latex" "application/x-latex"
-    "application/octet-stream" nil))
+;;; @@ predicate functions
+;;;
 
-(defvar mime-viewer/quitting-method-alist
-  '((gnus-article-mode
-     . (lambda ()
-        (mime-viewer/kill-buffer)
-        (delete-other-windows)
-        (gnus-article-show-summary)
-        ))
-    (rmail-mode
-     . (lambda ()
-        (mime-viewer/kill-buffer)
-        (rmail-summary)
-        (delete-other-windows)
-        ))
-    (mh-show-mode
-     . (lambda ()
-        (let ((win (get-buffer-window
-                    mime/output-buffer-name))
-              (buf
-               (mime::preview-content-info/buffer
-                (car mime::preview/content-list)))
+(defun mime-viewer/header-visible-p (rcnum cinfo &optional ctype)
+  (or (null rcnum)
+      (progn
+       (setq ctype
+             (mime::content-info/type
+              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)
+              ))
+       (member ctype mime-viewer/childrens-header-showing-Content-Type-list)
+       )))
+
+(defun mime-viewer/body-visible-p (rcnum cinfo &optional ctype)
+  (let (ccinfo)
+    (or ctype
+       (setq ctype
+             (mime::content-info/type
+              (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
+              ))
+       )
+    (and (member ctype mime-viewer/default-showing-Content-Type-list)
+        (if (string-equal ctype "application/octet-stream")
+            (progn
+              (or ccinfo
+                  (setq ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo))
+                  )
+              (member (mime::content-info/encoding ccinfo)
+                      '(nil "7bit" "8bit"))
               )
-          (if win
-              (delete-window win)
-            )
-          (mime-viewer/kill-buffer)
-          (pop-to-buffer
-           (let ((name (buffer-name buf)))
-             (string-match "show-" name)
-             (substring name (match-end 0))
-             ))
-          )))
-    (mime/show-message-mode
-     . (lambda ()
-        (set-window-configuration
-         mime/show-mode-old-window-configuration)
-        (let ((mother mime/mother-buffer))
-          (kill-buffer
-           (mime::preview-content-info/buffer
-            (car mime::preview/content-list)))
-          (mime-viewer/kill-buffer)
-          (pop-to-buffer mother)
-          (goto-char (point-min))
-          (mime-viewer/up-content)
-          )))
+          t))
     ))
 
-(defvar mime-viewer/decoding-mode "play" "MIME body decoding mode")
 
-
-;;; @ data structure
+;;; @@ content subject
 ;;;
 
-;;; @@ content-info
-;;;
+(defun mime-viewer/insert-content-subject
+  (rcnum cinfo ctype params subj)
+  (save-restriction
+    (narrow-to-region (point)(point))
+    (insert
+     (let ((access-type (assoc "access-type" params))
+          (num (or (assoc-value "x-part-number" params)
+                   (if (consp rcnum)
+                       (mapconcat (function
+                                   (lambda (num)
+                                     (format "%s" (1+ num))
+                                     ))
+                                  (reverse rcnum) ".")
+                     "0"))
+               ))
+       (if access-type
+          (let ((server (assoc "server" params)))
+            (setq access-type (cdr access-type))
+            (if server
+                (format "[%s %s ([%s] %s)]\n" num subj
+                        access-type (cdr server))
+              (let ((site (assoc-value "site" params))
+                    (dir (assoc-value "directory" params))
+                    )
+                (format "[%s %s ([%s] %s:%s)]\n" num subj
+                        access-type site dir)
+                )))
+        (format "[%s %s (%s)]\n" num subj ctype)
+        )))
+    (tm:add-button (point-min)(1- (point-max))
+                  (function mime-viewer/play-content))
+    ))
 
-(defun mime::make-content-info (beg end ctype params encoding children)
-  (vector beg end ctype params encoding children)
-  )
+(defun mime-viewer/default-content-subject-function
+  (rcnum cinfo ctype params subj)
+  (if (and (consp rcnum)
+          (not (member
+                ctype
+                mime-viewer/content-subject-omitting-Content-Type-list))
+          )
+      (mime-viewer/insert-content-subject
+       rcnum cinfo ctype params subj)
+    ))
 
-(defun mime::content-info/point-min (cinfo)
-  (elt cinfo 0)
-  )
+(defvar mime-viewer/content-subject-function
+  (function mime-viewer/default-content-subject-function))
 
-(defun mime::content-info/point-max (cinfo)
-  (elt cinfo 1)
-  )
 
-(defun mime::content-info/type (cinfo)
-  (elt cinfo 2)
-  )
+;;; @@ content header filter
+;;;
 
-(defun mime::content-info/parameters (cinfo)
-  (elt cinfo 3)
+(defun mime-viewer/default-content-header-filter ()
+  (goto-char (point-min))
+  (while (and (re-search-forward mime-viewer/ignored-field-regexp nil t)
+             (progn
+               (delete-region
+                (match-beginning 0)
+                (save-excursion
+                  (and
+                   (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
+                   (match-beginning 0)
+                   )))
+               t)))
+  (mime/decode-message-header)
   )
 
-(defun mime::content-info/encoding (cinfo)
-  (elt cinfo 4)
-  )
+(defvar mime-viewer/content-header-filter-alist nil)
 
-(defun mime::content-info/children (cinfo)
-  (elt cinfo 5)
-  )
 
-;;; @@ preview-content-info
+;;; @@ content filter
 ;;;
 
-(defun mime::make-preview-content-info (beg end buf cinfo)
-  (vector beg end buf cinfo)
-  )
+(defvar mime-viewer/content-filter-alist
+  '(("text/plain"      . mime-viewer/filter-text/plain)
+    ("application/pgp" . mime-viewer/filter-text/plain)
+    (nil . mime-viewer/filter-text/plain)))
 
-(defun mime::preview-content-info/point-min (pcinfo)
-  (elt pcinfo 0)
+(defun mime-viewer/default-content-filter (rcnum cinfo ctype params subj)
   )
 
-(defun mime::preview-content-info/point-max (pcinfo)
-  (elt pcinfo 1)
-  )
 
-(defun mime::preview-content-info/buffer (pcinfo)
-  (elt pcinfo 2)
-  )
+;;; @@ content separator
+;;;
 
-(defun mime::preview-content-info/content-info (pcinfo)
-  (elt pcinfo 3)
-  )
+(defun mime-viewer/default-content-separator (rcnum cinfo ctype params subj)
+  (if (and (not (mime-viewer/header-visible-p rcnum cinfo ctype))
+          (not (mime-viewer/body-visible-p rcnum cinfo ctype))
+          )
+      (progn
+       (goto-char (point-max))
+       (insert "\n")
+       )))
 
 
-;;; @ buffer local variables
+;;; @@ buffer local variables
 ;;;
 
-(defvar mime::article/content-info)
-(defvar mime::article/preview-buffer)
+(defvar mime/show-mode-old-window-configuration nil)
+(defvar mime/mother-buffer nil)
+
+(defvar mime::article/content-info nil)
+(defvar mime::article/preview-buffer nil)
 
+(defvar mime::preview/article-buffer nil)
 (defvar mime::preview/content-list nil)
 (defvar mime::preview/original-major-mode nil)
 
 
-;;; @ parser
+;;; @@ quitting method
+;;;
+
+(defvar mime-viewer/quitting-method-alist
+  '((mime/show-message-mode
+     . (lambda ()
+        (set-window-configuration
+         mime/show-mode-old-window-configuration)
+        (let ((mother mime/mother-buffer))
+          (kill-buffer
+           (mime::preview-content-info/buffer
+            (car mime::preview/content-list)))
+          (mime-viewer/kill-buffer)
+          (pop-to-buffer mother)
+          (goto-char (point-min))
+          (mime-viewer/up-content)
+          )))
+    ))
+
+
+;;; @@ X-Face
+;;;
+
+;; hack from Gnus 5.0.4.
+
+(defvar mime-viewer/x-face-command
+  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
+  "String to be executed to display an X-Face field.
+The command will be executed in a sub-shell asynchronously.
+The compressed face will be piped to this command.")
+
+(defun mime-viewer/x-face-function ()
+  "Function to display X-Face field. You can redefine to customize."
+  ;; 1995/10/12 (c.f. tm-eng:130)
+  ;;   fixed by Eric Ding <ericding@San-Jose.ate.slb.com>
+  (save-restriction
+    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
+    ;; end
+    (goto-char (point-min))
+    (if (re-search-forward "^X-Face:[ \t]*" nil t)
+       (let ((beg (match-end 0))
+             (end (rfc822/field-end))
+             )
+         (call-process-region beg end "sh" nil 0 nil
+                              "-c" mime-viewer/x-face-command)
+         ))))
+
+
+;;; @ data structures
+;;;
+
+;;; @@ preview-content-info
+;;;
+
+(define-structure mime::preview-content-info
+  point-min point-max buffer content-info)
+
+
+;;; @ buffer setup
 ;;;
 
-(defun mime-viewer/parse-message ()
+(defun mime-viewer/setup-buffer (&optional ctl encoding ibuf obuf)
+  (if ibuf
+      (progn
+       (get-buffer ibuf)
+       (set-buffer ibuf)
+       ))
   (make-variable-buffer-local 'mime::article/content-info)
-  (setq mime::article/content-info (mime-viewer/parse))
-  (let ((ret (mime-viewer/make-preview-buffer)))
+  (setq mime::article/content-info (mime/parse-message ctl encoding))
+  (let ((ret (mime-viewer/make-preview-buffer obuf)))
     (make-variable-buffer-local 'mime::article/preview-buffer)
     (setq mime::article/preview-buffer (car ret))
     ret))
 
-(defun mime-viewer/parse ()
-  (save-excursion
-    (save-restriction
-      (let ((ctl (progn
-                  (goto-char (point-min))
-                  (mime/Content-Type)
-                  ))
-           (encoding (progn
-                       (goto-char (point-min))
-                       (mime/Content-Transfer-Encoding)
-                       ))
-           )
-       (let ((ctype (car ctl))
-             (params (cdr ctl))
-             )
-         (if (stringp ctype)
-             (setq ctype (downcase ctype))
-           )
-         (if (stringp encoding)
-             (setq encoding (downcase encoding))
+(defun mime-viewer/make-preview-buffer (&optional obuf)
+  (let ((cinfo mime::article/content-info)
+       (the-buf (current-buffer))
+       (mode major-mode)
+       pcl dest)
+    (or obuf
+       (setq obuf (concat "*Preview-" (buffer-name the-buf) "*"))
+       )
+    (setq pcl (mime/flatten-content-info cinfo))
+    (let ((bf (get-buffer obuf)))
+      (if bf
+         (progn
+           (set-buffer obuf)
+           (setq buffer-read-only nil)
+           (erase-buffer)
            )
-         (let ((boundary (assoc "boundary" params)))
-           (search-forward "\n\n" nil t)
-           (cond (boundary
-                  (setq boundary
-                        (message/strip-quoted-string (cdr boundary)))
-                  (mime-viewer/parse-multipart 
-                   (match-end 0)
-                   (progn
-                     (search-forward (concat "--" boundary "--\n") nil t)
-                     (match-beginning 0)
-                     )
-                    boundary ctype params encoding)
-                  )
-                 ((string= ctype "message/rfc822")
-                  (mime::make-content-info
-                   (point-min) (point-max)
-                   ctype params encoding
-                   (save-excursion
-                     (save-restriction
-                       (narrow-to-region (match-end 0) (point-max))
-                       (list (mime-viewer/parse))
-                       ))
-                   )
-                  )
-                 (t 
-                  (mime::make-content-info (point-min) (point-max)
-                                           ctype params encoding nil)
-                  ))
-           ))))))
-
-(defun mime-viewer/parse-multipart (beg end boundary ctype params encoding)
-  (let ((sep (concat "^--" boundary "$"))
-       cb ce ct ret ncb children)
-    (save-excursion
-      (save-restriction
-       (narrow-to-region beg end)
-       (goto-char (point-min))
-       (search-forward (concat "--" boundary "\n") nil t)
-       (setq cb (match-end 0))
-       (while (re-search-forward sep nil t)
-         (setq ce (match-beginning 0))
-         (setq ncb (match-end 0))
-         (save-excursion
-           (save-restriction
-             (narrow-to-region cb ce)
-             (setq ret (mime-viewer/parse))
-             ))
-         (setq children (nconc children (list ret)))
-         (goto-char (mime::content-info/point-max ret))
-         (search-forward (concat "--" boundary "\n") nil t)
-         (goto-char (setq cb (match-end 0)))
-         )
-       (setq ce (point-max))
-       (save-excursion
-         (save-restriction
-           (narrow-to-region cb ce)
-           (setq ret (mime-viewer/parse))
-           ))
-       (setq children (nconc children (list ret)))
+       (setq bf (get-buffer-create obuf))
+       (set-buffer obuf)
        ))
-    (setq beg (point-min))
-    (goto-char beg)
-    (mime::make-content-info beg end ctype params encoding children)
+    (make-variable-buffer-local 'mime::preview/article-buffer)
+    (setq mime::preview/article-buffer the-buf)
+    (make-variable-buffer-local 'mime::preview/original-major-mode)
+    (setq mime::preview/original-major-mode mode)
+    (setq major-mode 'mime/viewer-mode)
+    (setq mode-name "MIME-View")
+    (setq dest
+         (mapcar
+          (function
+           (lambda (content)
+             (mime-viewer/display-content content cinfo the-buf obuf)
+             ))
+          pcl))
+    (set-buffer-modified-p nil)
+    (setq buffer-read-only t)
+    (set-buffer the-buf)
+    (list obuf dest)
     ))
 
-(defun mime/Content-Type ()
-  (save-excursion
+(defun mime-viewer/display-content (content cinfo ibuf obuf)
+  (let* ((beg (mime::content-info/point-min content))
+        (end (mime::content-info/point-max content))
+        (ctype (mime::content-info/type content))
+        (params (mime::content-info/parameters content))
+        (encoding (mime::content-info/encoding content))
+        (rcnum (mime::content-info/rcnum content))
+        he e nb ne subj)
+    (set-buffer ibuf)
+    (goto-char beg)
+    (setq he (if (re-search-forward "^$" nil t)
+                (1+ (match-end 0))
+              end))
+    (if (> he end)
+       (setq he end)
+      )
     (save-restriction
-      (if (and (re-search-forward "^Content-Type:[ \t]*" nil t)
-                (progn
-                  (narrow-to-region
-                   (point)
-                   (and (re-search-forward ".*\\(\n[ \t].*\\)*" nil t)
-                        (match-end 0))
-                   )
-                  (goto-char (point-min))
-                  (re-search-forward mime/content-type-subtype-regexp nil t)
-                  ))
-           (let ((ctype
-                  (downcase
-                   (buffer-substring (match-beginning 0) (match-end 0))
-                   ))
-                 dest attribute value)
-             (while (and (re-search-forward "[ \t\n]*;[ \t\n]*" nil t)
-                         (re-search-forward mime/token-regexp nil t)
-                         )
-               (setq attribute
-                     (downcase
-                      (buffer-substring (match-beginning 0) (match-end 0))
-                      ))
-               (if (and (re-search-forward "=[ \t\n]*" nil t)
-                        (re-search-forward mime/content-parameter-value-regexp
-                                           nil t)
-                        )
-                   (setq dest
-                         (put-alist attribute
-                                    (message/strip-quoted-string
-                                     (buffer-substring (match-beginning 0)
-                                                       (match-end 0)))
-                                    dest))
-                 )
+      (narrow-to-region beg end)
+      (setq subj
+           (mime-eword/decode-string
+            (mime-viewer/get-subject params encoding)))
+      )
+    (set-buffer obuf)
+    (setq nb (point))
+    (narrow-to-region nb nb)
+    (funcall mime-viewer/content-subject-function
+            rcnum cinfo ctype params subj)
+    (set-buffer ibuf)
+    (if (mime-viewer/header-visible-p rcnum cinfo ctype)
+       (mime-viewer/display-header beg he obuf)
+      )
+    (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
+          (mime-viewer/display-body he end obuf
+                                    rcnum cinfo ctype params subj encoding)
+          )
+         ((equal ctype "message/partial")
+          (mime-viewer/display-message/partial obuf)
+          )
+         ((and (null rcnum)
+               (null (mime::content-info/children cinfo))
                )
-             (cons ctype dest)
-             )))))
+          (set-buffer obuf)
+          (goto-char (point-max))
+          (mime-viewer/insert-content-subject rcnum cinfo ctype params subj)
+          )
+         (t (set-buffer obuf))
+         )
+    (mime-viewer/default-content-separator rcnum cinfo ctype params subj)
+    (prog1
+       (progn
+         (setq ne (point-max))
+         (widen)
+         (mime::preview-content-info/create nb (1- ne) ibuf content)
+         )
+      (goto-char ne)
+      )))
 
-(defun mime/Content-Transfer-Encoding (&optional default-encoding)
-  (save-excursion
+(defun mime-viewer/display-header (beg end obuf)
+  (let ((str (buffer-substring beg end))
+       (f (assq major-mode mime-viewer/content-header-filter-alist))
+       )
+    (save-excursion
+      (set-buffer obuf)
+      (save-restriction
+       (narrow-to-region (point)(point))
+       (insert str)
+       (if (and f (setq f (cdr f)))
+           (funcall f)
+         (mime-viewer/default-content-header-filter)
+         )
+       (run-hooks 'mime-viewer/content-header-filter-hook)
+       ))))
+
+(defun mime-viewer/display-body (beg end obuf
+                                    rcnum cinfo ctype params subj encoding)
+  (let ((str (buffer-substring beg end))
+       be)
+    (set-buffer obuf)
     (save-restriction
-      (if (and (re-search-forward "^Content-Transfer-Encoding:[ \t]*" nil t)
-              (re-search-forward mime/token-regexp nil t)
-              )
-         (downcase (buffer-substring (match-beginning 0) (match-end 0)))
-       default-encoding)
+      (setq be (point-max))
+      (narrow-to-region be be)
+      (insert str)
+      (let ((f (assoc-value ctype mime-viewer/content-filter-alist)))
+       (if (and f (fboundp f))
+           (funcall f ctype params encoding)
+         (mime-viewer/default-content-filter rcnum cinfo ctype params subj)
+         ))
       )))
 
-(defun mime/get-subject (param)
-  (save-excursion
-    (save-restriction
-      (let (ret)
-       (or (and (setq ret (assoc "name" param))
-                (message/strip-quoted-string (cdr ret))
-                )
-           (and (setq ret (assoc "x-name" param))
-                (message/strip-quoted-string (cdr ret))
-                )
-           (progn
+(defun mime-viewer/display-message/partial (obuf)
+  (set-buffer obuf)
+  (save-restriction
+    (goto-char (point-max))
+    (if (not (search-backward "\n\n" nil t))
+       (insert "\n")
+      )
+    (let ((be (point-max)))
+      (narrow-to-region be be)
+      (insert mime-viewer/announcement-for-message/partial)
+      (tm:add-button (point-min)(point-max)
+                    (function mime-viewer/play-content))
+      )))
+
+(defun mime-viewer/get-subject (param &optional encoding)
+  (if (member (or encoding
+                 (cdr (assq 'encoding param))
+                 )
+             mime-viewer/uuencode-encoding-name-list)
+      (save-excursion
+       (or (if (re-search-forward "^begin [0-9]+ " nil t)
+               (if (looking-at ".+$")
+                   (buffer-substring (match-beginning 0)(match-end 0))
+                 ))
+           ""))
+    (let (ret)
+      (or (and (setq ret (assoc "name" param))
+              (rfc822/strip-quoted-string (cdr ret))
+              )
+         (and (setq ret (assoc "x-name" param))
+              (rfc822/strip-quoted-string (cdr ret))
+              )
+         
+         (save-excursion
+           (save-restriction
+             (goto-char (point-min))
              (narrow-to-region (point-min)
                                (or (and (search-forward "\n\n" nil t)
                                         (match-beginning 0)
                                         )
                                    (point-max)))
              (or
-              (message/get-field-body "Content-Description")
-              (message/get-field-body "Subject")
-              ))
-           ""))
-      )))
-
-(defun mime/get-name (param)
-  (replace-as-filename (mime/get-subject param))
-  )
-
-(defun mime-viewer/make-preview-buffer (&optional buf cinfo obuf)
-  (let ((the-buf (current-buffer)) pcl dest)
-    (setq buf
-         (if (null buf)
-             (current-buffer)
-           (get-buffer buf)
-           ))
-    (if (null cinfo)
-       (progn
-         (switch-to-buffer buf)
-         (setq cinfo mime::article/content-info)
-         ))
-    (if (null obuf)
-       (setq obuf (concat "*Preview-" (buffer-name buf) "*"))
-      )
-    (setq pcl (mime::make-flat-content-list cinfo))
-    (if (get-buffer obuf)
-       (kill-buffer obuf)
-      )
-    (setq dest
-         (mapcar
-          (function
-           (lambda (cell)
-             (let ((beg (mime::content-info/point-min cell))
-                   (end (mime::content-info/point-max cell))
-                   (ctype (mime::content-info/type cell))
-                   (params (mime::content-info/parameters cell))
-                   cnum e nb ne subj str)
-               (setq cnum (mime::get-point-content-number beg cinfo))
-               (switch-to-buffer buf)
-               (setq e
-                     (if (not
-                          (member
-                           ctype
-                           mime-viewer/default-showing-Content-Type-list))
-                         (save-excursion
-                           (save-restriction
-                             (goto-char beg)
-                             (search-forward "\n\n" nil t)
-                             (match-end 0)
-                             ))
-                       end))
-               (if (> e (point-max))
-                   (setq e (point-max))
-                 )
-               (setq str (buffer-substring beg e))
-               (switch-to-buffer obuf)
-               (setq nb (point))
-               (insert str)
-               (setq ne (point))
-               (prog1
-                   (save-excursion
-                     (save-restriction
-                       (narrow-to-region nb ne)
-                       (mime/decode-message-header)
-                       (setq subj (mime/get-subject params))
-                       (let ((f
-                              (cdr
-                               (assoc ctype
-                                      mime-viewer/content-filter-alist))))
-                         (if (and f (fboundp f))
-                             (funcall f ctype params)
-                           ))
-                       (funcall mime-viewer/content-header-filter-function
-                                cnum cinfo)
-                       (goto-char nb)
-                       (funcall mime-viewer/content-subject-function
-                                cnum subj ctype params)
-                       (setq ne (point-max))
-                       (mime::make-preview-content-info nb (- ne 1)
-                                                        buf cell)
-                       ))
-                 (goto-char ne)
-                 )
-               ))) pcl))
-    (set-buffer-modified-p nil)
-    (setq buffer-read-only t)
-    (switch-to-buffer the-buf)
-    (list obuf dest)
+              (rfc822/get-field-body "Content-Description")
+              (rfc822/get-field-body "Subject")
+              )))
+         ""))
     ))
 
-
+  
 ;;; @ content information
 ;;;
 
-(defun mime::get-point-content-number (p &optional cinfo)
-  (if (null cinfo)
+(defun mime-article/point-content-number (p &optional cinfo)
+  (or cinfo
       (setq cinfo mime::article/content-info)
-    )
+      )
   (let ((b (mime::content-info/point-min cinfo))
        (e (mime::content-info/point-max cinfo))
        (c (mime::content-info/children cinfo))
              (catch 'tag
                (while c
                  (setq co (car c))
-                 (setq ret (mime::get-point-content-number p co))
+                 (setq ret (mime-article/point-content-number p co))
                  (cond ((eq ret t) (throw 'tag (list sn)))
                        (ret (throw 'tag (cons sn ret)))
                        )
                  (setq c (cdr c))
-                 (setq sn (+ sn 1))
+                 (setq sn (1+ sn))
                  )))
            t))))
 
-(defun mime::article/get-content-region (cn &optional cinfo)
-  (if (null cinfo)
+(defun mime-article/rcnum-to-cinfo (rcnum &optional cinfo)
+  (or cinfo
       (setq cinfo mime::article/content-info)
-    )
+      )
+  (some-element
+   (function
+    (lambda (ci)
+      (equal (mime::content-info/rcnum ci) rcnum)
+      ))
+   (mime/flatten-content-info cinfo)
+   ))
+
+(defun mime-article/cnum-to-cinfo (cn &optional cinfo)
+  (or cinfo
+      (setq cinfo mime::article/content-info)
+      )
   (if (eq cn t)
       cinfo
     (let ((sn (car cn)))
          cinfo
        (let ((rc (nth sn (mime::content-info/children cinfo))))
          (if rc
-             (mime::article/get-content-region (cdr cn) rc)
+             (mime-article/cnum-to-cinfo (cdr cn) rc)
            ))
        ))))
 
-(defun mime::make-flat-content-list (&optional cinfo)
-  (if (null cinfo)
+(defun mime/flatten-content-info (&optional cinfo)
+  (or cinfo
       (setq cinfo mime::article/content-info)
-    )
+      )
   (let ((dest (list cinfo))
        (rcl (mime::content-info/children cinfo))
        )
     (while rcl
-      (setq dest (nconc dest (mime::make-flat-content-list (car rcl))))
+      (setq dest (nconc dest (mime/flatten-content-info (car rcl))))
       (setq rcl (cdr rcl))
       )
     dest))
 
 (defun mime::point-preview-content (p &optional pcl)
-  (if (null pcl)
+  (or pcl
       (setq pcl mime::preview/content-list)
-    )
+      )
   (catch 'tag
     (let ((r pcl) cell)
       (while r
     ))
 
 
-;;; @ decoder
+;;; @ content filter
 ;;;
 
-(defun mime/Quoted-Printable-decode-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char (point-min))
-      (while (re-search-forward "=\n" nil t)
-       (replace-match "")
-       )
-      (goto-char (point-min))
-      (let (b e str)
-       (while (re-search-forward mime/Quoted-Printable-octet-regexp nil t)
-         (setq b (match-beginning 0))
-         (setq e (match-end 0))
-         (setq str (buffer-substring b e))
-         (delete-region b e)
-         (insert (mime/Quoted-Printable-decode-string str))
-         ))
-      )))
-
-(defun mime/Base64-decode-region (beg end)
-  (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char (point-min))
-      (while (search-forward "\n" nil t)
-       (replace-match "")
-       )
-      (let ((str (buffer-substring (point-min)(point-max))))
-       (delete-region (point-min)(point-max))
-       (insert (mime/base64-decode-string str))
-       ))))
-
-(defun mime/make-method-args (cal format)
-  (mapcar (function
-          (lambda (arg)
-            (if (stringp arg)
-                arg
-              (let ((ret (cdr (assoc (eval arg) cal))))
-                (if ret
-                    ret
-                  "")
-                ))
-            ))
-         format))
-
-(defun mime/start-external-method-region (beg end cal)
-  (save-excursion
-    (save-restriction
-      (narrow-to-region beg end)
-      (goto-char beg)
-      (let ((method (cdr (assoc 'method cal)))
-           (name (mime/get-name cal))
-           )
-       (if method
-           (let ((file (make-temp-name
-                        (expand-file-name "TM" mime/tmp-dir)))
-                 b args)
-             (if (nth 1 method)
-                 (setq b beg)
-               (search-forward "\n\n" nil t)
-               (setq b (match-end 0))
-               )
-             (goto-char b)
-             (write-region b end file)
-             (setq cal (put-alist
-                        'name (replace-as-filename name) cal))
-             (setq cal (put-alist 'file file cal))
-             (setq args (nconc
-                         (list (car method)
-                               mime/output-buffer-name (car method)
-                               )
-                         (mime/make-method-args cal (cdr (cdr method)))
-                         ))
-             (apply (function start-process) args)
-             (mime/show-output-buffer)
-             ))
-       ))))
+(defvar mime-viewer/code-converter-alist nil)
 
-(defun mime/decode-message/partial-region (beg end cal)
-  (goto-char beg)
-  (let* ((root-dir (expand-file-name
-                   (concat "m-prts-" (user-login-name)) mime/tmp-dir))
-        (id (cdr (assoc "id" cal)))
-        (number (cdr (assoc "number" cal)))
-        (total (cdr (assoc "total" cal)))
-        (the-buf (current-buffer))
-        file
-        (mother mime::article/preview-buffer))
-    (if (not (file-exists-p root-dir))
-       (shell-command (concat "mkdir " root-dir))
-      )
-    (setq id (replace-as-filename id))
-    (setq root-dir (concat root-dir "/" id))
-    (if (not (file-exists-p root-dir))
-       (shell-command (concat "mkdir " root-dir))
-      )
-    (setq file (concat root-dir "/FULL"))
-    (if (not (file-exists-p file))
-       (progn
-         (re-search-forward "^$")
-         (goto-char (+ (match-end 0) 1))
-         (setq file (concat root-dir "/" number))
-         (write-region (point) (point-max) file)
-         (if (get-buffer "*MIME-temp*")
-             (kill-buffer "*MIME-temp*")
-           )
-         (switch-to-buffer "*MIME-temp*")
-         (let ((i 1)
-               (max (string-to-int total))
-               )
-           (catch 'tag
-             (while (<= i max)
-               (setq file (concat root-dir "/" (int-to-string i)))
-               (if (not (file-exists-p file))
-                   (progn
-                     (switch-to-buffer the-buf)
-                     (throw 'tag nil)
-                     ))
-               (insert-file-contents file)
-               (goto-char (point-max))
-               (setq i (+ i 1))
-               )
-             (delete-other-windows)
-             (write-file (concat root-dir "/FULL"))
-             (setq major-mode 'mime/show-message-mode)
-             (mime/viewer-mode mother)
-             (pop-to-buffer (current-buffer))
-             ))
-         )
-      (progn
-       (delete-other-windows)
-       (find-file file)
-       (setq major-mode 'mime/show-message-mode)
-       (mime/viewer-mode mother)
-       (pop-to-buffer (current-buffer))
-       ))
+(defun mime-viewer/default-code-convert-region
+  (beg end charset &optional encoding)
+  (if (member encoding '("quoted-printable" "base64"))
+      (mime/code-convert-region-to-emacs beg (point-max) charset)
     ))
 
-(defun mime/get-content-decoding-alist (al)
-  (get-unified-alist mime/content-decoding-condition al)
-  )
-
-(defun mime::article/decode-content-region (cinfo)
-  (interactive "*r")
-  (let ((beg (mime::content-info/point-min cinfo))
-       (end (mime::content-info/point-max cinfo))
-       (ctype (mime::content-info/type cinfo))
-       (params (mime::content-info/parameters cinfo))
-       (encoding (mime::content-info/encoding cinfo))
+(defun mime-viewer/filter-text/plain (ctype params encoding)
+  (let ((charset (cdr (assoc "charset" params)))
+       (beg (point-min)) (end (point-max))
        )
-    (if ctype
-       (let (method cal ret)
-         (setq cal (append (list (cons 'type ctype)
-                                 (cons 'encoding encoding)
-                                 (cons 'major-mode major-mode)
-                                 )
-                           params))
-         (if mime-viewer/decoding-mode
-             (setq cal (cons
-                        (cons 'mode mime-viewer/decoding-mode)
-                        cal))
-           )
-         (setq ret (mime/get-content-decoding-alist cal))
-         (setq method (cdr (assoc 'method ret)))
-         (cond ((and (symbolp method)
-                     (fboundp method))
-                (funcall method beg end ret)
-                )
-               ((and (listp method)(stringp (car method)))
-                (mime/start-external-method-region beg end ret)
-                )
-               (t (mime/show-output-buffer
-                   "No method are specified for %s\n" ctype)
-                  ))
-         ))
-    ))
-
-(defun mime/show-output-buffer (&rest forms)
-  (let ((the-buf (current-buffer)))
-    (if (null (get-buffer-window mime/output-buffer-name))
-       (split-window-vertically (/ (* (window-height) 3) 4))
-      )
-    (pop-to-buffer mime/output-buffer-name)
-    (goto-char (point-max))
-    (if forms
-       (insert (apply (function format) forms))
-      )
-    (pop-to-buffer the-buf)
-    ))
-
-
-;;; @ content filter
-;;;
-
-(defun mime-viewer/filter-text/plain (ctype params)
-  (save-excursion
-    (save-restriction
-      (let ((charset (cdr (assoc "charset" params)))
-           (encoding
-            (save-excursion
-              (save-restriction
-                (goto-char (point-min))
-                (narrow-to-region (point-min)
-                                  (or (and (search-forward "\n\n" nil t)
-                                           (match-beginning 0))
-                                      (point-max)))
-                (goto-char (point-min))
-                (mime/Content-Transfer-Encoding "7bit")
-                )))
-           (beg (point-min)) (end (point-max))
-           )
+    (mime/decode-region encoding beg end)
+    (let* ((mode mime::preview/original-major-mode)
+          (m (assq mode mime-viewer/code-converter-alist))
+          )
+      (if (and m (fboundp (setq m (cdr m))))
+         (funcall m beg (point-max) charset encoding)
+       (mime-viewer/default-code-convert-region beg (point-max)
+                                                charset encoding)
+       )))
+  (goto-char (point-max))
+  (if (not (eq (char-after (1- (point))) ?\n))
+      (insert "\n")
+    )
+  (if browse-url-browser-function
+      (progn
        (goto-char (point-min))
-       (if (search-forward "\n\n" nil t)
-           (setq beg (match-end 0))
-         )
-       (if (cond ((string= encoding "quoted-printable")
-                  (mime/Quoted-Printable-decode-region beg end)
-                  t)
-                 ((string= encoding "base64")
-                  (mime/Base64-decode-region beg end)
-                  t))
-           (mime/code-convert-region-to-emacs beg (point-max) charset)
-         )
-       ))))
+       (while (re-search-forward tm:URL-regexp nil t)
+         (tm:add-button (match-beginning 0)(match-end 0)
+                        (function tm:browse-url))
+         )))
+  (run-hooks 'mime-viewer/plain-text-preview-hook)
+  )
 
 
 ;;; @ MIME viewer mode
       (define-key mime/viewer-mode-map
        "\C-c\C-p" (function mime-viewer/print-content))
       (define-key mime/viewer-mode-map
+       "f"        (function mime-viewer/display-x-face))
+      (define-key mime/viewer-mode-map
        "q"        (function mime-viewer/quit))
       (define-key mime/viewer-mode-map
        "\C-c\C-x" (function mime-viewer/kill-buffer))
+      (if mouse-button-2
+         (define-key mime/viewer-mode-map
+           mouse-button-2 (function tm:button-dispatcher))
+       )
       ))
 
-(defun mime/viewer-mode (&optional mother)
+(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf)
   "Major mode for viewing MIME message.
 
-u      Move to upper content
-p      Move to previous content
-n      Move to next content
-SPC    Scroll up
-M-SPC  Scroll down
-DEL    Scroll down
-RET    Move to next line
-M-RET  Move to previous line
-v      Decode the content as `play mode'
-e      Decode the content as `extract mode'
-C-c C-p        Decode the content as `print mode'
-q      Quit
+Here is a list of the standard keys for mime/viewer-mode.
+
+key            feature
+---            -------
+
+u              Move to upper content
+p              Move to previous content
+n              Move to next content
+SPC            Scroll up or move to next content
+M-SPC          Scroll down or move to previous content
+DEL            Scroll down or move to previous content
+RET            Move to next line
+M-RET          Move to previous line
+v              Decode current content as `play mode'
+e              Decode current content as `extract mode'
+C-c C-p                Decode current content as `print mode'
+f              Display X-Face
+q              Quit
+button-2       Move to point under the mouse cursor
+               and decode current content as `play mode'
+
+
+Here are all the commands with their current binding,
+listed in key order:
+
+\\{mime/viewer-mode-map}
 "
   (interactive)
-  (let ((buf (get-buffer mime/output-buffer-name))
-       (the-buf (current-buffer))
-       )
+  (setq mime-viewer/ignored-field-regexp
+       (concat "^\\("
+               (mapconcat (function regexp-quote)
+                          mime-viewer/ignored-field-list "\\|")
+               "\\):"))
+  (let ((buf (get-buffer mime/output-buffer-name)))
     (if buf
-       (progn
-         (switch-to-buffer buf)
+       (save-excursion
+         (set-buffer buf)
          (erase-buffer)
-         (switch-to-buffer the-buf)
          )))
-  (let ((ret (mime-viewer/parse-message))
-       (mode major-mode))
-    (switch-to-buffer (car ret))
-    (setq major-mode 'mime/viewer-mode)
-    (setq mode-name "MIME-View")
-    (make-variable-buffer-local 'mime::preview/original-major-mode)
-    (setq mime::preview/original-major-mode
-         (if mother
-             (progn
-               (make-variable-buffer-local
-                'mime/show-mode-old-window-configuration)
-               (setq mime/show-mode-old-window-configuration
-                     (current-window-configuration))
-               (make-variable-buffer-local 'mime/mother-buffer)
-               (setq mime/mother-buffer mother)
-               'mime/show-message-mode)
-           mode))
-    (use-local-map mime/viewer-mode-map)
-    (make-variable-buffer-local 'mime::preview/content-list)
-    (setq mime::preview/content-list (nth 1 ret))
-    (goto-char
-     (let ((ce (mime::preview-content-info/point-max
-               (car mime::preview/content-list)
-               ))
-          e)
-       (goto-char (point-min))
-       (search-forward "\n\n" nil t)
-       (setq e (match-end 0))
-       (if (<= e ce)
-          e
-        ce)))
-    (run-hooks 'mime/viewer-mode-hook)
-    ))
+  (let ((ret (mime-viewer/setup-buffer ctl encoding ibuf obuf))) 
+    (prog1
+       (switch-to-buffer (car ret))
+      (if mother
+         (progn
+           (make-variable-buffer-local
+            'mime/show-mode-old-window-configuration)
+           (setq mime/show-mode-old-window-configuration
+                 (current-window-configuration))
+           (make-variable-buffer-local 'mime/mother-buffer)
+           (setq mime/mother-buffer mother)
+           ))
+      (use-local-map mime/viewer-mode-map)
+      (make-variable-buffer-local 'mime::preview/content-list)
+      (setq mime::preview/content-list (nth 1 ret))
+      (goto-char
+       (let ((ce (mime::preview-content-info/point-max
+                 (car mime::preview/content-list)
+                 ))
+            e)
+        (goto-char (point-min))
+        (search-forward "\n\n" nil t)
+        (setq e (match-end 0))
+        (if (<= e ce)
+            e
+          ce)))
+      (run-hooks 'mime/viewer-mode-hook)
+      )))
 
-(defun mime::preview/decode-content ()
-  (interactive)
-  (let ((pc (mime::point-preview-content (point))))
-    (if pc
-       (let ((the-buf (current-buffer)))
-         (switch-to-buffer (mime::preview-content-info/buffer pc))
-         (mime::article/decode-content-region
-          (mime::preview-content-info/content-info pc))
-         (if (eq (current-buffer)
-                 (mime::preview-content-info/buffer pc))
-             (switch-to-buffer the-buf)
-           )
-         ))))
+(defun mime-preview/point-content-number (point)
+  (save-window-excursion
+    (let ((pc (mime::point-preview-content (point)))
+         cinfo)
+      (switch-to-buffer (mime::preview-content-info/buffer pc))
+      (setq cinfo (mime::preview-content-info/content-info pc))
+      (mime-article/point-content-number (mime::content-info/point-min cinfo))
+      )))
+
+(defun mime-preview/cinfo-to-pcinfo (cinfo)
+  (let ((rpcl mime::preview/content-list) cell)
+    (catch 'tag
+      (while rpcl
+       (setq cell (car rpcl))
+       (if (eq cinfo (mime::preview-content-info/content-info cell))
+           (throw 'tag cell)
+         )
+       (setq rpcl (cdr rpcl))
+       ))))
+
+(autoload 'mime-preview/decode-content "tm-play")
+
+(defvar mime-viewer/decoding-mode "play" "MIME body decoding mode")
 
 (defun mime-viewer/play-content ()
   (interactive)
   (let ((mime-viewer/decoding-mode "play"))
-    (mime::preview/decode-content)
+    (mime-preview/decode-content)
     ))
 
 (defun mime-viewer/extract-content ()
   (interactive)
   (let ((mime-viewer/decoding-mode "extract"))
-    (mime::preview/decode-content)
+    (mime-preview/decode-content)
     ))
 
 (defun mime-viewer/print-content ()
   (interactive)
   (let ((mime-viewer/decoding-mode "print"))
-    (mime::preview/decode-content)
+    (mime-preview/decode-content)
+    ))
+
+(defun mime-viewer/display-x-face ()
+  (interactive)
+  (save-window-excursion
+    (set-buffer mime::preview/article-buffer)
+    (mime-viewer/x-face-function)
     ))
 
 (defun mime-viewer/up-content ()
   (interactive)
   (let ((pc (mime::point-preview-content (point))) cinfo
        (the-buf (current-buffer))
-       cn r)
+       rcnum r)
     (switch-to-buffer (mime::preview-content-info/buffer pc))
     (setq cinfo (mime::preview-content-info/content-info pc))
-    (setq cn (mime::get-point-content-number
-             (mime::content-info/point-min cinfo)))
-    (if (eq cn t)
+    (setq rcnum (mime::content-info/rcnum cinfo))
+    (if (null rcnum)
        (mime-viewer/quit the-buf
                          (mime::preview-content-info/buffer pc)
                          )
-      (setq r (mime::article/get-content-region (butlast cn)))
+      (setq r (mime-article/rcnum-to-cinfo (cdr rcnum)))
       (switch-to-buffer the-buf)
       (catch 'tag
        (let ((rpcl mime::preview/content-list) cell)
@@ -1017,9 +843,9 @@ q  Quit
 
 (defun mime-viewer/scroll-up-content (&optional h)
   (interactive)
-  (if (null h)
+  (or h
       (setq h (- (window-height) 1))
-    )
+      )
   (let ((pcl mime::preview/content-list)
        (p (point))
        np beg)
@@ -1036,13 +862,15 @@ q        Quit
     (forward-line h)
     (if (> (point) np)
        (goto-char np)
-      )))
+      )
+    ;;(show-subtree)
+    ))
 
 (defun mime-viewer/scroll-down-content (&optional h)
   (interactive)
-  (if (null h)
+  (or h
       (setq h (- (window-height) 1))
-    )
+      )
   (let ((pcl mime::preview/content-list)
        (p (point))
        pp beg)
@@ -1075,13 +903,13 @@ q        Quit
 
 (defun mime-viewer/quit (&optional the-buf buf)
   (interactive)
-  (if (null the-buf)
+  (or the-buf
       (setq the-buf (current-buffer))
-    )
-  (if (null buf)
+      )
+  (or buf
       (setq buf (mime::preview-content-info/buffer
                 (mime::point-preview-content (point))))
-    )
+      )
   (let ((r (progn
             (switch-to-buffer buf)
             (assoc major-mode mime-viewer/quitting-method-alist)
@@ -1098,6 +926,10 @@ q Quit
   (kill-buffer (current-buffer))
   )
 
-(fset 'mime/view-mode 'mime/viewer-mode)
+
+;;; @ end
+;;;
+
+(provide 'tm-view)
 
 (run-hooks 'tm-view-load-hook)