Function `eword-decode-message-header' was renamed to

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

diff --git a/mime-view.el b/mime-view.el
index bbbbf98..39efedf 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.0 $
+;; Version: $Revision: 0.11 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -34,17 +34,16 @@
 (require 'tl-misc)
 (require 'std11)
 (require 'mel)
-(require 'tm-ew-d)
-(require 'tm-def)
-(require 'tm-parse)
-(require 'tm-text)
+(require 'eword-decode)
+(require 'mime-parse)
+(require 'mime-text)
 
 
 ;;; @ version
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.0 1997-02-20 08:53:12 tmorioka Exp $")
+  "$Id: mime-view.el,v 0.11 1997-02-24 01:59:28 tmorioka Exp $")
 
 (defconst mime-view-version (get-version-string mime-view-RCS-ID))
 
@@ -315,7 +314,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-message-header)
   )
 
 (defvar mime-view-content-header-filter-alist nil)
@@ -449,7 +448,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))
@@ -470,7 +469,7 @@ The compressed face will be piped to this command.")
     (erase-buffer)
     (setq mime::preview/article-buffer the-buf)
     (setq mime::preview/original-major-mode mode)
-    (setq major-mode 'mime/viewer-mode)
+    (setq major-mode 'mime-view-mode)
     (setq mode-name "MIME-View")
     (let ((drest dest))
       (while pcl
@@ -504,7 +503,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)
@@ -730,75 +729,70 @@ The compressed face will be piped to this command.")
        (popup-menu 'mime-view-xemacs-popup-menu))
       ))
 
-(defun mime-view-define-keymap (&optional mother default-function)
-  (let ((mime/viewer-mode-map (if mother
-                                 (copy-keymap mother)
-                               (make-sparse-keymap)
-                               )))
-    (or mother default-function
-       (suppress-keymap mime/viewer-mode-map))
-    (define-key mime/viewer-mode-map
+(defun mime-view-define-keymap (&optional default)
+  (let ((mime-view-mode-map (if (keymapp default)
+                               (copy-keymap default)
+                             (make-sparse-keymap)
+                             )))
+    (define-key mime-view-mode-map
       "u"        (function mime-view-up-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "p"        (function mime-view-previous-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "n"        (function mime-view-next-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\e\t"     (function mime-view-previous-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\t"       (function mime-view-next-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       " "        (function mime-view-scroll-up-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\M- "     (function mime-view-scroll-down-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\177"     (function mime-view-scroll-down-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\C-m"     (function mime-view-next-line-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\C-\M-m"  (function mime-view-previous-line-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "v"        (function mime-view-play-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "e"        (function mime-view-extract-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\C-c\C-p" (function mime-view-print-content))
-    (define-key mime/viewer-mode-map
-      "x"        (function mime-view-display-x-face))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "a"        (function mime-view-follow-content))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "q"        (function mime-view-quit))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "h"        (function mime-view-show-summary))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "\C-c\C-x" (function mime-view-kill-buffer))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "<"        (function beginning-of-buffer))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       ">"        (function end-of-buffer))
-    (define-key mime/viewer-mode-map
+    (define-key mime-view-mode-map
       "?"        (function describe-mode))
-    (if default-function
-       (setq mime/viewer-mode-map
-             (append mime/viewer-mode-map
-                     (list (cons t default-function))
-                     )))
+    (if (functionp default)
+       (setq mime-view-mode-map
+             (append mime-view-mode-map (list (cons t default)))
+             ))
     (if mouse-button-2
-       (define-key mime/viewer-mode-map
+       (define-key mime-view-mode-map
          mouse-button-2 (function tm:button-dispatcher))
       )
     (cond (running-xemacs
-          (define-key mime/viewer-mode-map
+          (define-key mime-view-mode-map
             mouse-button-3 (function mime-view-xemacs-popup-menu))
           )
          ((>= emacs-major-version 19)
-          (define-key mime/viewer-mode-map [menu-bar mime-view]
+          (define-key mime-view-mode-map [menu-bar mime-view]
             (cons mime-view-menu-title
                   (make-sparse-keymap mime-view-menu-title)))
           (mapcar (function
                    (lambda (item)
-                     (define-key mime/viewer-mode-map
+                     (define-key mime-view-mode-map
                        (vector 'menu-bar 'mime-view (car item))
                        (cons (nth 1 item)(nth 2 item))
                        )
@@ -806,15 +800,15 @@ The compressed face will be piped to this command.")
                   (reverse mime-view-menu-list)
                   )
           ))
-    (use-local-map mime/viewer-mode-map)
+    (use-local-map mime-view-mode-map)
     (run-hooks 'mime-view-define-keymap-hook)
     ))
 
-(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf
-                                  mother-keymap default-function)
+(defun mime-view-mode (&optional mother ctl encoding ibuf obuf
+                                default-keymap-or-function)
   "Major mode for viewing MIME message.
 
-Here is a list of the standard keys for mime/viewer-mode.
+Here is a list of the standard keys for mime-view-mode.
 
 key            feature
 ---            -------
@@ -852,7 +846,7 @@ button-2    Move to point under the mouse cursor
          (progn
            (setq mime::preview/mother-buffer mother)
            ))
-      (mime-view-define-keymap mother-keymap default-function)
+      (mime-view-define-keymap default-keymap-or-function)
       (setq mime::preview/content-list (nth 1 ret))
       (goto-char
        (let ((ce (mime::preview-content-info/point-max
@@ -865,7 +859,7 @@ button-2    Move to point under the mouse cursor
         (if (<= e ce)
             e
           ce)))
-      (run-hooks 'mime/viewer-mode-hook)
+      (run-hooks 'mime-view-mode-hook)
       )))
 
 (defun mime-preview/point-content-number (point)
@@ -888,7 +882,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")
 
@@ -1013,7 +1007,7 @@ button-2  Move to point under the mouse cursor
                      ))
                (setq rest (cdr rest))
                ))
-           (mime/decode-message-header)
+           (eword-decode-message-header)
            )
          (let ((f (cdr (assq mode mime-view-following-method-alist))))
            (if (functionp f)