tm 6.14

diff --git a/Makefile b/Makefile
index 16a5951..7535946 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 2.0 1995/03/26 16:27:41 morioka Exp morioka $
+# $Id: Makefile,v 3.0 1995/04/17 19:06:08 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -38,7 +38,7 @@ FILES = tm/README.eng tm/rel-*.ol tm/Makefile tm/Makefile.bc \
        tm/mh-e/Makefile tm/mh-e/Makefile.bc tm/mh-e/*.el \
        tl/README.eng tl/Makefile tl/Makefile.bc tl/*.el tl/doc/*.texi
 
-TARFILE = tm6.11.tar
+TARFILE = tm6.14.tar
 
 
 nemacs:
@@ -62,17 +62,25 @@ install-mule1:      mule1
 orig19:
        make -f Makefile.bc all \
                EMACS=$(ORIG19) EMACS_TYPE=orig TLSRCDIR=$(TLSRCDIR)
-
+       (cd gnus; make orig19)
+       (cd mh-e; make orig19)
+       
 install-orig19:        orig19
        make -f Makefile.bc install TMDIR=$(TMDIR19) EMACS_TYPE=orig
+       (cd gnus; make install-19)
+       (cd mh-e; make install-19)
 
 
 mule2:
        make -f Makefile.bc all \
                EMACS=$(MULE2) EMACS_TYPE=mule TLSRCDIR=$(TLSRCDIR)
+       (cd gnus; make mule2)
+       (cd mh-e; make mule2)
 
 install-mule2: mule2
        make -f Makefile.bc install TMDIR=$(TMDIR19) EMACS_TYPE=mule
+       (cd gnus; make install-19)
+       (cd mh-e; make install-19)
 
 
 all:   $(UTILS) $(DVI)

diff --git a/doc/tiny-mime-eng.tex b/doc/tiny-mime-eng.tex
index 475c4d0..2fbb020 100644 (file)
--- a/doc/tiny-mime-eng.tex
+++ b/doc/tiny-mime-eng.tex
@@ -1,4 +1,4 @@
-\documentstyle{article}
+\documentstyle[a4j]{jarticle}
 \setcounter{secnumdepth}{6}
 \setcounter{tocdepth}{6}
 \topsep=0.1cm

diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el
index 0628ab3..41bf7b7 100644 (file)
--- a/mh-e/tm-mh-e.el
+++ b/mh-e/tm-mh-e.el
@@ -2,6 +2,7 @@
 ;;; A MIME extender for mh-e
 ;;;
 ;;; by Morioka Tomohiko, 1993/11/21
+;;; modified by YAMAOKA Katsumi <yamaoka@ga.sony.co.jp>
 ;;;
 
 (provide 'tm-mh-e)
@@ -21,7 +22,7 @@
 ;;; @ version
 ;;;
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 5.3 1994/10/25 09:06:36 morioka Exp $")
+  "$Id: tm-mh-e.el,v 6.0 1995/04/12 11:46:08 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
@@ -49,6 +50,14 @@ With arg, turn MIME processing on if arg is positive."
   (mh-invalidate-show-buffer)
   (mh-show-msg (mh-get-msg-num t))
   (pop-to-buffer mh-show-buffer t)
+  
+  ;; patch for mh-narrow.el
+  ;; by YAMAOKA Katsumi <yamaoka@ga.sony.co.jp>
+  (if (featurep 'mh-narrow)
+      (widen)
+    )
+  ;; end of patch
+  
   (mime/viewer-mode)
   )
 

diff --git a/tm-comp.el b/tm-comp.el
index 4bc5212..3c74b92 100644 (file)
--- a/tm-comp.el
+++ b/tm-comp.el
@@ -4,8 +4,10 @@
 ;;; by  MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; and   OKABE Yasuo    <okabe@kudpc.kyoto-u.ac.jp>
 ;;; modified by MORITA Masahiro <hiro@isl.ntt.JP>
-;;;         and MORIOKA Tomohiko
-;;;
+;;;             MORIOKA Tomohiko,
+;;;      Kazushi (Jam) MARUKAWA <kazusi-m@is.aist-nara.ac.jp>,
+;;;             OKABE Yasuo,
+;;;        and Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
 
 (provide 'tm-comp)
 (require 'tm-misc)
@@ -17,7 +19,7 @@
 ;;;
 
 (defconst mime/composer-RCS-ID
-  "$Id: tm-comp.el,v 3.3 1994/12/16 12:54:23 morioka Exp $")
+  "$Id: tm-comp.el,v 5.1 1995/04/17 18:52:07 morioka Exp $")
 
 (defconst mime/composer-version (get-version-string mime/composer-RCS-ID))
 
@@ -187,9 +189,12 @@ Optional argument ENCODING specifies an encoding method such as base64."
            (file-coding-system-for-read
             (if (featurep 'mule) *noconv*))
            (kanji-flag nil))           ;NEmacs
-       (insert-file-contents file)))
+       (let (jka-compr-compression-info-list
+             jam-zcat-filename-list)
+         (insert-file-contents file))))
     (prog1
-       (if (string-equal (downcase encoding) "x-uue")
+       (if (and (stringp encoding)
+                (string-equal (downcase encoding) "x-uue"))
            (let ((mime-transfer-encoders
                   (copy-alist (cons (list "x-uue" "uuencode"
                                           (file-name-nondirectory file))

diff --git a/tm-latex.el b/tm-latex.el
index 5440ea4..f2d8884 100644 (file)
--- a/tm-latex.el
+++ b/tm-latex.el
@@ -5,7 +5,7 @@
 ;;;
 ;;; modified by MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;;
-;;; $Id: tm-latex.el,v 1.2 1995/01/10 02:01:06 morioka Exp $
+;;; $Id: tm-latex.el,v 2.0 1995/04/07 12:05:33 morioka Exp $
 ;;;
 
 (provide 'tm-latex)
@@ -16,7 +16,7 @@
         (name (or (cdr (assoc "name" cal))
                   (cdr (assoc "x-name" cal))
                   (concat (make-temp-name "tm") ".tex"))))
-    (switch-to-buffer mime/preview-buffer)
+    (switch-to-buffer mime::article/preview-buffer)
     (find-file (expand-file-name name mime/tmp-dir))
     (if (or (<= (buffer-size) 0)
            (y-or-n-p "Replace the existing buffer?"))

diff --git a/tm-view.el b/tm-view.el
index 35a5ec9..b64ed21 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -2,6 +2,7 @@
 ;;; A MIME viewer for GNU Emacs
 ;;;
 ;;; by Morioka Tomohiko, 1994/07/13
+;;; 
 
 (provide 'tm-view)
 
@@ -20,7 +21,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.11 1995/03/23 09:59:10 morioka Exp $")
+  "$Id: tm-view.el,v 6.14 1995/04/12 11:52:34 morioka Exp morioka $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -182,6 +183,14 @@
              (string-match "show-" name)
              (substring name (match-end 0))
              ))
+          ;; patch for mh-narrow.el
+          ;; by YAMAOKA Katsumi <yamaoka@ga.sony.co.jp>
+          (if (and (featurep 'mh-narrow)
+                   (fboundp 'mh-narrow-to-page))
+              (save-excursion
+                (set-buffer mh-show-buffer)
+                (mh-narrow-to-page)))
+          ;; end of patch
           )))
     (mime/show-message-mode
      . (lambda ()
@@ -272,64 +281,67 @@
 ;;; @ parser
 ;;;
 
-(defun mime-viewer/parse-message ()
+(defun mime-viewer/parse-message (&optional ctl encoding)
   (make-variable-buffer-local 'mime::article/content-info)
-  (setq mime::article/content-info (mime-viewer/parse))
+  (setq mime::article/content-info (mime-viewer/parse ctl encoding))
   (let ((ret (mime-viewer/make-preview-buffer)))
     (make-variable-buffer-local 'mime::article/preview-buffer)
     (setq mime::article/preview-buffer (car ret))
     ret))
 
-(defun mime-viewer/parse ()
+(defun mime-viewer/parse (&optional ctl encoding)
   (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))
+      (if (null ctl)
+         (setq ctl (progn
+                     (goto-char (point-min))
+                     (mime/Content-Type)
+                     ))
+       )
+      (if (null encoding)
+         (setq encoding (progn
+                          (goto-char (point-min))
+                          (mime/Content-Transfer-Encoding)
+                          ))
+       )
+      (let ((ctype (car ctl))
+           (params (cdr ctl))
            )
-         (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))
-                       ))
+       (if (stringp ctype)
+           (setq ctype (downcase ctype))
+         )
+       (if (stringp encoding)
+           (setq encoding (downcase encoding))
+         )
+       (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)
                    )
-                  )
-                 (t 
-                  (mime::make-content-info (point-min) (point-max)
-                                           ctype params encoding nil)
-                  ))
-           ))))))
+                 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 "$"))
@@ -864,7 +876,7 @@
        "\C-c\C-x" (function mime-viewer/kill-buffer))
       ))
 
-(defun mime/viewer-mode (&optional mother)
+(defun mime/viewer-mode (&optional mother ctl encoding)
   "Major mode for viewing MIME message.
 
 u      Move to upper content
@@ -890,7 +902,7 @@ q   Quit
          (erase-buffer)
          (switch-to-buffer the-buf)
          )))
-  (let ((ret (mime-viewer/parse-message))
+  (let ((ret (mime-viewer/parse-message ctl encoding))
        (mode major-mode))
     (switch-to-buffer (car ret))
     (setq major-mode 'mime/viewer-mode)