`mime::article/code-converter' -> `mime-raw::text-decoder'.

[elisp/semi.git] / mime-view.el

diff --git a/mime-view.el b/mime-view.el
index 7865180..3c97161 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -6,7 +6,7 @@
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.3 $
+;; Version: $Revision: 0.24 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -28,15 +28,11 @@
 
 ;;; Code:
 
-(require 'tl-str)
-(require 'tl-list)
-(require 'tl-atype)
-(require 'tl-misc)
+(require 'cl)
 (require 'std11)
 (require 'mel)
-(require 'tm-ew-d)
-(require 'tm-def)
-(require 'tm-parse)
+(require 'eword-decode)
+(require 'mime-parse)
 (require 'mime-text)
 
 
@@ -44,7 +40,7 @@
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.3 1997-02-21 04:25:10 tmorioka Exp $")
+  "$Id: mime-view.el,v 0.24 1997-03-15 22:20:20 morioka Exp $")
 
 (defconst mime-view-version (get-version-string mime-view-RCS-ID))
 
@@ -125,6 +121,10 @@
      (method . mime-article/decode-message/partial)
      (mode . "play")
      )
+    ((type . "message/external-body")
+     ("access-type" . "anon-ftp")
+     (method . mime-article/decode-message/external-ftp)
+     )
     
     ((method "metamail" t "-m" "tm" "-x" "-d" "-z" "-e" 'file)
      (mode . "play")
@@ -234,7 +234,7 @@ Each elements are regexp of field-name. [mime-view.el]")
     (narrow-to-region (point)(point))
     (let ((access-type (assoc "access-type" params))
          (charset (assoc "charset" params))
-         (num (or (assoc-value "x-part-number" params)
+         (num (or (cdr (assoc "x-part-number" params))
                   (if (consp rcnum)
                       (mapconcat (function
                                   (lambda (num)
@@ -249,8 +249,8 @@ Each elements are regexp of field-name. [mime-view.el]")
               (if server
                   (insert (format "[%s %s ([%s] %s)]\n" num subj
                                   access-type (cdr server)))
-                (let ((site (assoc-value "site" params))
-                      (dir (assoc-value "directory" params))
+                (let ((site (cdr (assoc "site" params)))
+                      (dir (cdr (assoc "directory" params)))
                       )
                   (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
                                   access-type site dir))
@@ -272,8 +272,8 @@ Each elements are regexp of field-name. [mime-view.el]")
                 )
               (insert rest)
               ))))
-    (tm:add-button (point-min)(1- (point-max))
-                  (function mime-view-play-content))
+    (mime-add-button (point-min)(1- (point-max))
+                    (function mime-view-play-content))
     ))
 
 (defun mime-preview/default-content-button-function
@@ -315,7 +315,7 @@ Each elements are regexp of field-name. [mime-view.el]")
 
 (defun mime-view-default-content-header-filter ()
   (mime-preview/cut-header)
-  (mime/decode-message-header)
+  (eword-decode-header)
   )
 
 (defvar mime-view-content-header-filter-alist nil)
@@ -347,18 +347,31 @@ Each elements are regexp of field-name. [mime-view.el]")
 ;;; @@ buffer local variables
 ;;;
 
-;; for XEmacs
-(defvar mime::article/preview-buffer nil)
-(defvar mime::article/code-converter nil)
-(defvar mime::preview/article-buffer nil)
+;;; @@@ in raw buffer
+;;;
 
 (make-variable-buffer-local 'mime::article/content-info)
+
+(defvar mime::article/preview-buffer nil)
 (make-variable-buffer-local 'mime::article/preview-buffer)
-(make-variable-buffer-local 'mime::article/code-converter)
+
+(defvar mime-raw::text-decoder nil
+  "Function to decode text in current buffer.
+Interface of the function is (CHARSET &optional ENCODING).
+CHARSET is symbol of MIME charset and ENCODING is value of
+Content-Transfer-Encoding.")
+(make-variable-buffer-local 'mime-raw::text-decoder)
+
+
+;;; @@@ in view buffer
+;;;
 
 (make-variable-buffer-local 'mime::preview/mother-buffer)
 (make-variable-buffer-local 'mime::preview/content-list)
+
+(defvar mime::preview/article-buffer nil)
 (make-variable-buffer-local 'mime::preview/article-buffer)
+
 (make-variable-buffer-local 'mime::preview/original-major-mode)
 (make-variable-buffer-local 'mime::preview/original-window-configuration)
 
@@ -449,7 +462,7 @@ The compressed face will be piped to this command.")
        (set-buffer ibuf)
        ))
   (or mime-view-redisplay
-      (setq mime::article/content-info (mime/parse-message ctl encoding))
+      (setq mime::article/content-info (mime-parse-message ctl encoding))
       )
   (let ((ret (mime-view-make-preview-buffer obuf)))
     (setq mime::article/preview-buffer (car ret))
@@ -504,7 +517,7 @@ The compressed face will be piped to this command.")
     (save-restriction
       (narrow-to-region beg end)
       (setq subj
-           (mime-eword/decode-string
+           (eword-decode-string
             (mime-article/get-subject params encoding)))
       )
     (set-buffer obuf)
@@ -581,8 +594,8 @@ The compressed face will be piped to this command.")
     (let ((be (point-max)))
       (narrow-to-region be be)
       (insert mime-view-announcement-for-message/partial)
-      (tm:add-button (point-min)(point-max)
-                    (function mime-view-play-content))
+      (mime-add-button (point-min)(point-max)
+                      (function mime-view-play-content))
       )))
 
 (defun mime-article/get-uu-filename (param &optional encoding)
@@ -713,31 +726,31 @@ The compressed face will be piped to this command.")
     )
   "Menu for MIME Viewer")
 
-(if running-xemacs
-    (progn
-      (defvar mime-view-xemacs-popup-menu
-       (cons mime-view-menu-title
-             (mapcar (function
-                      (lambda (item)
-                        (vector (nth 1 item)(nth 2 item) t)
-                        ))
-                     mime-view-menu-list)))
-      (defun mime-view-xemacs-popup-menu (event)
-       "Popup the menu in the MIME Viewer buffer"
-       (interactive "e")
-       (select-window (event-window event))
-       (set-buffer (event-buffer event))
-       (popup-menu 'mime-view-xemacs-popup-menu))
-      ))
+(cond (running-xemacs
+       (defvar mime-view-xemacs-popup-menu
+        (cons mime-view-menu-title
+              (mapcar (function
+                       (lambda (item)
+                         (vector (nth 1 item)(nth 2 item) t)
+                         ))
+                      mime-view-menu-list)))
+       (defun mime-view-xemacs-popup-menu (event)
+        "Popup the menu in the MIME Viewer buffer"
+        (interactive "e")
+        (select-window (event-window event))
+        (set-buffer (event-buffer event))
+        (popup-menu 'mime-view-xemacs-popup-menu))
+       (defvar mouse-button-2 'button2)
+       )
+      (t
+       (defvar mouse-button-2 [mouse-2])
+       ))
 
 (defun mime-view-define-keymap (&optional default)
   (let ((mime-view-mode-map (if (keymapp default)
                                (copy-keymap default)
                              (make-sparse-keymap)
                              )))
-    (or (keymapp default)
-       (suppress-keymap mime-view-mode-map)
-       )
     (define-key mime-view-mode-map
       "u"        (function mime-view-up-content))
     (define-key mime-view-mode-map
@@ -765,8 +778,6 @@ The compressed face will be piped to this command.")
     (define-key mime-view-mode-map
       "\C-c\C-p" (function mime-view-print-content))
     (define-key mime-view-mode-map
-      "x"        (function mime-view-display-x-face))
-    (define-key mime-view-mode-map
       "a"        (function mime-view-follow-content))
     (define-key mime-view-mode-map
       "q"        (function mime-view-quit))
@@ -786,7 +797,7 @@ The compressed face will be piped to this command.")
              ))
     (if mouse-button-2
        (define-key mime-view-mode-map
-         mouse-button-2 (function tm:button-dispatcher))
+         mouse-button-2 (function mime-button-dispatcher))
       )
     (cond (running-xemacs
           (define-key mime-view-mode-map
@@ -888,7 +899,7 @@ button-2    Move to point under the mouse cursor
        (setq rpcl (cdr rpcl))
        ))))
 
-(autoload 'mime-preview/decode-content "tm-play")
+(autoload 'mime-preview/decode-content "mime-play")
 
 (defvar mime-view-decoding-mode "play" "MIME body decoding mode")
 
@@ -952,9 +963,7 @@ button-2    Move to point under the mouse cursor
               new-buf
               (the-buf (current-buffer))
               (a-buf mime::preview/article-buffer)
-              (hb (mime::content-info/point-min cinfo))
-              (he (mime::content-info/point-max cinfo))
-              fields from to cc reply-to subj mid f)
+              fields)
          (save-excursion
            (set-buffer (setq new-buf (get-buffer-create new-name)))
            (erase-buffer)
@@ -984,8 +993,8 @@ button-2    Move to point under the mouse cursor
                                  (concat "^"
                                          (apply (function regexp-or) fields)
                                          ":") ""))))
-                      (if (string-equal (mime::content-info/type ci)
-                                        "message/rfc822")
+                      (if (string= (mime::content-info/type ci)
+                                   "message/rfc822")
                           nil
                         (if str
                             (insert str)
@@ -1013,7 +1022,7 @@ button-2  Move to point under the mouse cursor
                      ))
                (setq rest (cdr rest))
                ))
-           (mime/decode-message-header)
+           (eword-decode-header)
            )
          (let ((f (cdr (assq mode mime-view-following-method-alist))))
            (if (functionp f)