tm 6.9

diff --git a/Makefile b/Makefile
index 9c99c6b..c7857b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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.08.tar
+TARFILE = tm6.09.tar
 
 
 nemacs:

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

diff --git a/rel-6eng.ol b/rel-6eng.ol
index 448292a..8a2fcd1 100644 (file)
--- a/rel-6eng.ol
+++ b/rel-6eng.ol
@@ -127,3 +127,28 @@ cinfo }).
 (5) variable `mime/go-to-top-node-method-alist' is renamed to
     `mime-viewer/quitting-method-alist' and changed initial value
     because of changes between tm-view 5.21 and tm-view 6.*.
+
+
+** new variables
+
+*** mime-viewer/childrens-header-showing-Content-Type-list
+
+  list of content-type/subtype whose children's header should be
+displayed.
+
+  This variable is used in function
+`mime-viewer/default-content-header-filter-function' which defined as
+default value of variable
+`mime-viewer/content-header-filter-function'. Therefore if you set
+another function, it may not work this variable.
+
+
+*** mime-viewer/ignored-field-list
+
+  list of field-name which is not displayed when header is displayed.
+
+  This variable is used in function
+`mime-viewer/default-content-header-filter-function' which defined as
+default value of variable
+`mime-viewer/content-header-filter-function'. Therefore if you set
+another function, it may not work this variable.

diff --git a/rel-6jp.ol b/rel-6jp.ol
index 1a005de..2cfa6c6 100644 (file)
--- a/rel-6jp.ol
+++ b/rel-6jp.ol
@@ -114,7 +114,8 @@ mime::preview-content-info/FOO (FOO = {Bp|Ep|buf|cinfo}) \e$B$r;H$&$h$&$K\e(B
     mime-viewer/content-subject-function \e$B$K2~L>$7!"0z?t$rJQ99$7$?!#\e(B
 
 (3) \e$BJQ?t\e(B mime/make-content-header-filter \e$B$r\e(B
-    mime-viewer/content-header-filter-function \e$B$K2~L>$7$?!#\e(B
+    mime-viewer/content-header-filter-function \e$B$K2~L>$7!"0z?t$rJQ99$7\e(B
+    \e$B$?!#\e(B
 
 (4) \e$BJQ?t\e(B mime/default-showing-Content-Type-list \e$B$r\e(B
     mime-viewer/default-showing-Content-Type-list \e$B$K2~L>$7$?!#\e(B
@@ -122,3 +123,27 @@ mime::preview-content-info/FOO (FOO = {Bp|Ep|buf|cinfo}) \e$B$r;H$&$h$&$K\e(B
 (5) \e$BJQ?t\e(B mime/go-to-top-node-method-alist \e$B$r\e(B
     mime-viewer/quitting-method-alist \e$B$K2~L>$7$?!#$^$?!"\e(Bsymbol \e$BL>$d;E\e(B
     \e$BMM$NJQ99$K$H$b$J$$!"=i4|@_Dj$rJQ99$7$?!#\e(B
+
+
+** \e$B?7$7$$JQ?t\e(B
+
+*** \e$BJQ?t\e(B mime-viewer/childrens-header-showing-Content-Type-list
+
+  \e$B;R6!$N\e(B header \e$B$rI=<($9$Y$-\e(B content-type/subtype \e$B$N\e(B list.
+
+  \e$B$3$NJQ?t$O!"JQ?t\e(B mime-viewer/content-header-filter-function \e$B$N4{DjCM\e(B
+\e$B$H$7$FDj5A$5$l$F$$$k4X?t\e(B 
+mime-viewer/default-content-header-filter-function \e$B$,;2>H$7$F$$$k$N$G!"\e(B
+\e$B$b$7!"JQ?t\e(B mime-viewer/content-header-filter-function \e$B$NCM$rJL$N4X?t$K\e(B
+\e$B$9$l$PL58z$K$J$k!#\e(B
+
+
+*** \e$BJQ?t\e(B mime-viewer/ignored-field-list
+
+  header \e$B$rI=<($9$k>l9g$G$bI=<($7$J$$\e(B field \e$B$N\e(B field-name \e$B$N\e(B list.
+
+  \e$B$3$NJQ?t$O!"JQ?t\e(B mime-viewer/content-header-filter-function \e$B$N4{DjCM\e(B
+\e$B$H$7$FDj5A$5$l$F$$$k4X?t\e(B 
+mime-viewer/default-content-header-filter-function \e$B$,;2>H$7$F$$$k$N$G!"\e(B
+\e$B$b$7!"JQ?t\e(B mime-viewer/content-header-filter-function \e$B$NCM$rJL$N4X?t$K\e(B
+\e$B$9$l$PL58z$K$J$k!#\e(B

diff --git a/tm-ftp.el b/tm-ftp.el
index 6907d13..d4e5fc0 100644 (file)
--- a/tm-ftp.el
+++ b/tm-ftp.el
@@ -6,7 +6,7 @@
 ;;; modified by MORIOKA Tomohiko <morioka@jaist.ac.jp>  (1994/11/ 8)
 ;;;         and OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp> (1994/11/11)
 ;;;
-;;; $Id: tm-ftp.el,v 5.0 1994/11/11 04:45:17 morioka Exp $
+;;; $Id: tm-ftp.el,v 6.0 1995/03/13 16:49:24 morioka Exp $
 ;;;
 
 (provide 'tm-ftp)
@@ -23,7 +23,7 @@
     (setq pathname
          (concat "/anonymous@" site ":" directory))
     (message (concat "Accessing " pathname "/" name "..."))
-    (switch-to-buffer mime/preview-buffer)
+    (switch-to-buffer mime::article/preview-buffer)
     (dired pathname)
     (goto-char (point-min))
     (search-forward name)

diff --git a/tm-view.el b/tm-view.el
index 4e8afd2..48446b5 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -20,7 +20,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.8 1995/03/12 15:58:32 morioka Exp $")
+  "$Id: tm-view.el,v 6.9 1995/03/13 19:50:43 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -101,14 +101,51 @@
 (defvar mime-viewer/content-header-filter-function
   (function mime-viewer/default-content-header-filter-function))
 
-(defun mime-viewer/default-content-header-filter-function (cnum)
-  (if (listp cnum)
+(defvar mime-viewer/childrens-header-showing-Content-Type-list
+  '("message/rfc822"))
+
+(defvar mime-viewer/ignored-field-list
+  '("Received"))
+
+(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"
@@ -470,7 +507,7 @@
                              (funcall f ctype params)
                            ))
                        (funcall mime-viewer/content-header-filter-function
-                                cnum)
+                                cnum cinfo)
                        (goto-char nb)
                        (funcall mime-viewer/content-subject-function
                                 cnum subj ctype params)