From: morioka <morioka>
Date: Mon, 2 Mar 1998 15:38:19 +0000 (+0000)
Subject: tm 6.72
X-Git-Tag: tm6_72~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63130ba4e02aedc5c33f7bbf8eaef8d8ed0c8911;p=elisp%2Ftm.git

tm 6.72
---

diff --git a/Changes-6.72.en b/Changes-6.72.en
new file mode 100644
index 0000000..7ba4424
--- /dev/null
+++ b/Changes-6.72.en
@@ -0,0 +1,10 @@
+tm-view.el
+----------------------------
+revision 6.72
+date: 1995/08/12 18:58:45;  author: morioka;  state: Exp;  lines: +2 -4
+Added `mime-viewer/content-header-filter-hook'.
+----------------------------
+
+installer
+	tm-mh-e is byte-compiled and installed by mk-tmh written by
+	Emacs Lisp. So make-lpath, inst-el and inst-elc are removed.
diff --git a/Changes-6.72.ja b/Changes-6.72.ja
new file mode 100644
index 0000000..336e06b
--- /dev/null
+++ b/Changes-6.72.ja
@@ -0,0 +1,11 @@
+tm-view.el
+----------------------------
+revision 6.72
+date: 1995/08/12 18:58:45;  author: morioka;  state: Exp;  lines: +2 -4
+mime-viewer/content-header-filter-hook を設けた。
+----------------------------
+
+installer
+	tm-mh-e の byte-compile, install を Emacs Lisp で書いた mk-tmh 
+	で行なうようにした。このことに伴い、make-lpath, inst-el,
+	inst-elc を廃止した。
diff --git a/Makefile b/Makefile
index 43d6df8..2b2dd20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 6.20 1995/08/11 09:31:28 morioka Exp morioka $
+# $Id: Makefile,v 6.23 1995/08/14 17:25:12 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -23,10 +23,6 @@ MULE2	= mule2
 TMDIR18 = $(HOME)/lib/emacs18/lisp
 TMDIR19 = $(HOME)/lib/emacs19/lisp
 
-# Please specify GNUS type (`gnus3' or `gnus4') if you use Emacs 18.*
-EMACS18_GNUS  = gnus3
-# EMACS18_GNUS  = gnus4
-
 # Please specify optional load-path
 NEMACS_OPT = /usr/local/lib/nemacs/local.lisp
 MULE1_OPT  = /usr/local/lib/mule/local.lisp
@@ -46,7 +42,6 @@ GOMI	= $(UTILS) *.elc loadpath
 
 TM_FILES = tm/README.eng tm/rel-*.ol tm/Changes* \
 		tm/Makefile tm/mk-tm \
-		tm/make-lpath tm/inst-el tm/inst-elc \
 		tm/tm-view.el tm/tiny-mime.el \
 		tm/tm-mule.el tm/tm-nemacs.el tm/tm-orig.el tm/tm-misc.el \
 		tm/tm-ftp.el tm/tm-latex.el tm/tm-partial.el \
@@ -54,14 +49,14 @@ TM_FILES = tm/README.eng tm/rel-*.ol tm/Changes* \
 		tm/tm-comp.el \
 		tm/tm-setup.el tm/mime-setup.el \
 		tm/signature.el tm/sc-setup.el tm/gnushook.el \
-		tm/*.c tm/methods \
+		tm/*.c tm/methods/tm* \
 		tm/doc/Makefile tm/doc/*.pln tm/doc/*.ol tm/doc/*.tex \
 		tm/doc/*.texi
 
 TM_MUA_FILES =	tm/tm-rmail.el tm/tm-vm.el \
 		tm/gnus/Makefile tm/gnus/*-path tm/gnus/mk-tgnus \
 		tm/gnus/*.el \
-		tm/mh-e/Makefile tm/mh-e/Makefile.bc tm/mh-e/code-jp.ol \
+		tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/code-jp.ol \
 		tm/mh-e/*.el
 
 MEL_FILES = mel/*.el mel/Makefile mel/mk-mel
@@ -71,100 +66,72 @@ TL_FILES = tl/README.eng \
 		tl/*.el tl/doc/*.texi
 
 FILES	= $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
-	
-TARFILE = tm6.71.tar
 
+TARFILE = tm6.72.tar
 
-lpath-nemacs:
-	./make-lpath $(NEMACS_OPT)
 
-nemacs:	lpath-nemacs
+nemacs:
 	cd ../tl; PWD=`pwd` make nemacs NEMACS=$(NEMACS)
 	cd ../mel; PWD=`pwd` make elc EMACS=$(NEMACS)
 	$(NEMACS) -batch -l mk-tm -f compile-tm
 	cd gnus; PWD=`pwd` make gnus3 EMACS=$(NEMACS)
-	cd mh-e; PWD=`pwd` \
-		make nemacs NEMACS=$(NEMACS) NEMACS_MH_E=$(NEMACS_MH_E)
-
-nemacs-vm: lpath-nemacs
-	make -f Makefile.bc tm-vm EMACS=$(NEMACS) EMACS_TYPE=nemacs
+	cd mh-e; PWD=`pwd` make elc EMACS=$(NEMACS)
 
-install-nemacs:	nemacs install-mua-18
+install-nemacs:	nemacs
 	cd ../tl; PWD=`pwd` make install-nemacs NEMACS=$(NEMACS)
 	cd ../mel; PWD=`pwd` make install-18 EMACS=$(NEMACS)
 	$(NEMACS) -batch -l mk-tm -f install-tm $(TMDIR18)
 	cd gnus; PWD=`pwd` make install-18 EMACS=$(NEMACS) TMDIR18=$(TMDIR18)
+	cd mh-e; PWD=`pwd` make install-18 EMACS=$(NEMACS) TMDIR18=$(TMDIR18)
 
-lpath-mule1:
-	./make-lpath $(MULE1_OPT)
 
-mule1:	lpath-mule1
+mule1:
 	cd ../tl; PWD=`pwd` make mule1 MULE1=$(MULE1)
 	cd ../mel; PWD=`pwd` make elc EMACS=$(MULE1)
 	$(MULE1) -batch -l mk-tm -f compile-tm
 	cd gnus; PWD=`pwd` make gnus3 EMACS=$(MULE1)
-	cd mh-e; PWD=`pwd` \
-		make mule1 MULE1=$(MULE1) NEMACS_MH_E=$(MULE1_MH_E)
+	cd mh-e; PWD=`pwd` make elc EMACS=$(MULE1)
 
-mule1-vm: lpath-mule1
-	make -f Makefile.bc tm-vm EMACS=$(MULE1) EMACS_TYPE=mule
-
-install-mule1:	mule1 install-mua-18
+install-mule1:	mule1
 	cd ../tl; PWD=`pwd` make install-mule1 MULE1=$(MULE1)
 	cd ../mel; PWD=`pwd` make install-18 EMACS=$(MULE1)
 	$(MULE1) -batch -l mk-tm -f install-tm $(TMDIR18)
 	cd gnus; PWD=`pwd` make install-18 EMACS=$(MULE1) TMDIR18=$(TMDIR18)
-
-install-mua-18:
-	cd mh-e; PWD=`pwd` make install-18 TMDIR18=$(TMDIR18)
-	make -f Makefile.bc install-tm-vm TMDIR=$(TMDIR18)
+	cd mh-e; PWD=`pwd` make install-18 EMACS=$(MULE1) TMDIR18=$(TMDIR18)
 
 
-lpath-orig19:
-	./make-lpath $(ORIG19_OPT)
-
-orig19:	lpath-orig19
+orig19:
 	cd ../tl; PWD=`pwd` make orig19 ORIG19=$(ORIG19)
 	cd ../mel; PWD=`pwd` make elc EMACS=$(ORIG19)
 	$(ORIG19) -batch -l mk-tm -f compile-tm
 	cd gnus; PWD=`pwd` make gnus4 EMACS=$(ORIG19)
 # If you use (ding) GNUS, please comment use following:
 #	cd gnus; PWD=`pwd` make dgnus EMACS=$(ORIG19)
-	cd mh-e; PWD=`pwd` make orig19 ORIG19=$(ORIG19)
-
-orig19-vm: lpath-orig19
-	make -f Makefile.bc tm-vm EMACS=$(ORIG19) EMACS_TYPE=orig
+	cd mh-e; PWD=`pwd` make elc EMACS=$(ORIG19)
 
-install-orig19:	orig19 install-mua-19
+install-orig19:	orig19
 	cd ../tl; PWD=`pwd` make install-orig19 ORIG19=$(ORIG19)
 	cd ../mel; PWD=`pwd` make install-19 EMACS=$(ORIG19)
 	$(ORIG19) -batch -l mk-tm -f install-tm $(TMDIR19)
 	cd gnus; PWD=`pwd` make install-19 EMACS=$(ORIG19) TMDIR19=$(TMDIR19)
+	cd mh-e; PWD=`pwd` make install-19 EMACS=$(ORIG19) TMDIR19=$(TMDIR19)
 
-lpath-mule2:
-	./make-lpath $(MULE2_OPT)
 
-mule2:	lpath-mule2
+mule2:
 	cd ../tl; PWD=`pwd` make mule2 MULE2=$(MULE2)
 	cd ../mel; PWD=`pwd` make elc EMACS=$(MULE2)
 	$(MULE2) -batch -l mk-tm -f compile-tm
 	cd gnus; PWD=`pwd` make gnus4 EMACS=$(MULE2)
 # If you use (ding) GNUS, please comment use following:
 #	cd gnus; PWD=`pwd` make dgnus EMACS=$(MULE2)
-	cd mh-e; PWD=`pwd` make mule2 MULE2=$(MULE2)
+	cd mh-e; PWD=`pwd` make elc EMACS=$(MULE2)	
 
-mule2-vm: lpath-mule2
-	make -f Makefile.bc tm-vm EMACS=$(MULE2) EMACS_TYPE=mule
-
-install-mule2:	mule2 install-mua-19
+install-mule2:	mule2
 	cd ../tl; PWD=`pwd` make install-mule2 MULE2=$(MULE2)
 	cd ../mel; PWD=`pwd` make install-19 EMACS=$(MULE2)
 	$(MULE2) -batch -l mk-tm -f install-tm $(TMDIR19)
 	cd gnus; PWD=`pwd` make install-19 EMACS=$(MULE2) TMDIR19=$(TMDIR19)
-
-install-mua-19:
-	cd mh-e; PWD=`pwd` make install-19 TMDIR19=$(TMDIR19)
-	make -f Makefile.bc install-tm-vm TMDIR=$(TMDIR19)
+	cd mh-e; PWD=`pwd` make install-19 EMACS=$(MULE2) TMDIR19=$(TMDIR19)
 
 
 all:	$(UTILS) $(DVI)
diff --git a/README.eng b/README.eng
index 0a8ca99..7c70661 100644
--- a/README.eng
+++ b/README.eng
@@ -1,6 +1,6 @@
 [README for tm (English Version)]
 by MORIOKA Tomohiko <morioka@jaist.ac.jp>
-$Id: README.eng,v 6.1 1995/08/11 09:48:55 morioka Exp $
+$Id: README.eng,v 6.3 1995/08/14 17:46:22 morioka Exp $
 
 1 What's tm?
 
@@ -163,11 +163,6 @@ is dgnus-0.98.7-tm.diff.
   Run `make install-19', if you use Emacs 19.*.
 
 
-5.2 tm-rmail or tm-vm
-
-  Please copy tm-rmail.el or tm-vm.el to Emacs Lisp install path.
-
-
 6 .emacs
 
 Please insert (load "mime-setup") or (load "tm-setup") in .emacs. If
@@ -189,6 +184,33 @@ example:
 	;; (require 'mh-e) ; if you use mh-e, please use it.
 	(load "mime-compose")
 
+6.3 setting sample for hilit19
+
+======================================================================
+(cond (window-system
+       (let* ((header-patterns '(("^Subject:.*$" nil msg-subject)
+				 ("^From:.*$" nil msg-from)
+				 ("^--text follows this line--$"
+				  nil msg-separator)
+				 ("^[A-Za-z][A-Za-z0-9-]+:" nil msg-header)
+				 ))
+	      (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>}|]\\).*$"
+				nil msg-quote)))
+	      (message-patterns (append header-patterns body-patterns))
+	      )
+	 (hilit-set-mode-patterns 'msg-header header-patterns)
+	 (hilit-set-mode-patterns 'msg-body body-patterns)
+	 (hilit-set-mode-patterns 'mime/viewer-mode
+				  message-patterns
+				  'hilit-rehighlight-message)
+	 )
+       (add-hook 'mime-viewer/content-header-filter-hook
+		 (function hilit-rehighlight-buffer-quietly))
+       (add-hook 'mime-viewer/plain-text-preview-hook
+		 (function hilit-rehighlight-buffer-quietly))
+       ))
+======================================================================
+
 
 7 How to use mime/viewer-mode
 
diff --git a/doc/tm-view_en.texi b/doc/tm-view_en.texi
index 919ed61..c821c56 100644
--- a/doc/tm-view_en.texi
+++ b/doc/tm-view_en.texi
@@ -6,14 +6,14 @@
 @titlepage
 @title tm-view Manual (English Version)
 @author by MORIOKA Tomohiko
-@code{$Id: tm-view_en.texi,v 3.0 1995/08/01 18:49:44 morioka Exp $}
+@code{$Id: tm-view_en.texi,v 3.0 1995/08/01 18:49:44 morioka Exp morioka $}
 @end titlepage
 
 
 @node Top, Mechanism, (dir), (dir)
 @comment  node-name,  next,  previous,  up
-@chapter{tm-view}
-@cindex{tm-view}
+@chapter tm-view
+@cindex tm-view
 
 The tm-view is a general MIME viewer running on GNU Emacs.
 
@@ -51,8 +51,8 @@ Indexes
 
 @node Mechanism, How to run, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Mechanism}
-@cindex{Mechanism}
+@chapter Mechanism
+@cindex Mechanism
 
 tm-view managements two buffers, one is for raw message called
 @strong{article buffer}, another one is to preview for user called
@@ -75,8 +75,8 @@ content-type/subtype of Content-Type field.
 
 @node How to run, How to use, Mechanism, Top
 @comment  node-name,  next,  previous,  up
-@chapter{How to run mime/viewer-mode}
-@cindex{How to run mime/viewer-mode}
+@chapter How to run mime/viewer-mode
+@cindex How to run mime/viewer-mode
 
 @deffn{Command} mime/viewer-mode &optional mother ctl encoding
 
@@ -99,8 +99,8 @@ instead of Content-Type field of the article buffer.
 
 @node How to use, Preview Buffer, How to run, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Commands of mime/viewer-mode}
-@cindex{Commands of mime/viewer-mode}
+@chapter Commands of mime/viewer-mode
+@cindex Commands of mime/viewer-mode
 
 @code{mime/viewer-mode} has following functions:
 
@@ -141,10 +141,10 @@ Actual playback/extract/print will be performed by a method.
 @end enumerate
 
 
-@node Preview Buffer, content-subject, how-to-use, Top
+@node Preview Buffer, Decoding, How to use, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Screen design of preview buffer}
-@cindex{Screen design of preview buffer}
+@chapter Screen design of preview buffer
+@cindex Screen design of preview buffer
 
 In preview buffer, following are displayed for each content:
 
@@ -200,8 +200,8 @@ MORIOKA, Tomohiko <morioka@@jaist.ac.jp>
 
 @node content-subject, content-header, Preview Buffer, Preview Buffer
 @comment  node-name,  next,  previous,  up
-@section{content-subject}
-@cindex{content-subject}
+@section content-subject
+@cindex content-subject
 
 content-subject is a part to display abstract for the content. It is
 placed in top of content.
@@ -267,8 +267,8 @@ the function @code{mime-viewer/default-content-subject-function}.
 
 @node content-header, content-body, content-subject, Preview Buffer
 @comment  node-name,  next,  previous,  up
-@section{content-header}
-@cindex{content-header}
+@section content-header
+@cindex content-header
 
 A content header shows the header portion of a content in the preview
 buffer.
@@ -324,8 +324,8 @@ It is called when content-header-filter is not found in variable
 
 @node content-body, content-separator, content-header, Preview Buffer
 @comment  node-name,  next,  previous,  up
-@section{content-body}
-@cindex{content-body}
+@section content-body
+@cindex content-body
 
 Content-body represents content of the message. tm-view does not
 display raw content body. For example, if a content has binary, it is
@@ -380,10 +380,10 @@ In default, it does nothing.
 @end deffn
 
 
-@node content-separator, Decoding, content-body, Preview Buffer
+@node content-separator, , content-body, Preview Buffer
 @comment  node-name,  next,  previous,  up
-@section{content-separator}
-@cindex{content-separator}
+@section content-separator
+@cindex content-separator
 
 Content-separator is displayed to represent boundary of contents.
 
@@ -406,10 +406,10 @@ content-body are not displayed.
 @end deffn
 
 
-@node Decoding, decoding-condition, Preview Buffer, Top
+@node Decoding, Concept Index, Preview Buffer, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Decoding}
-@cindex{Decoding}
+@chapter Decoding
+@cindex Decoding
 
 In @code{mime/viewer-mode}, you can do play (@key{v}), extract
 (@key{e}), or print (@key{C-c C-p}) for each content. These operations
@@ -439,8 +439,8 @@ audio, image or video.
 
 @node decoding-condition, Format of method value, Decoding, Decoding
 @comment  node-name,  next,  previous,  up
-@section{Setting of content decoding condition}
-@cindex{Setting of content decoding condition}
+@section Setting of content decoding condition
+@cindex Setting of content decoding condition
 
 When decoding operation is driven, tm-view calls a method matched for
 the condition searched from the variable
@@ -471,7 +471,7 @@ like
 @end lisp
 
 As you notice, now you can define the arguments to pass to a external
-method.  Refer to \ref{sec:method-arguments} section for more
+method.  Refer to @xref{Format of method value} section for more
 explanation.
 
 This condition definition will match all contents whose types are
@@ -501,8 +501,8 @@ executed.
 
 @node Format of method value, Example of decoding-condition, decoding-condition, Decoding
 @comment  node-name,  next,  previous,  up
-@section{Format of method value part}
-@cindex{Format of method value part}
+@section Format of method value part
+@cindex Format of method value part
 
 You can specify the method field of the decoding-condition definition
 in two different ways,
@@ -571,10 +571,10 @@ name matches with it, and pass the value of that parameter to the
 external method.
 
 
-@node Example of decoding-condition, Concept Index, Format of method value, Decoding
+@node Example of decoding-condition, , Format of method value, Decoding
 @comment  node-name,  next,  previous,  up
-@section{Examples of decoding-condition}
-@cindex{Examples of decoding-condition}
+@section Examples of decoding-condition
+@cindex Examples of decoding-condition
 
 The default definition of a mime/content-decoding-condition variable
 is shown below.
diff --git a/doc/tm_en.texi b/doc/tm_en.texi
index e0cade6..b693438 100644
--- a/doc/tm_en.texi
+++ b/doc/tm_en.texi
@@ -1,19 +1,19 @@
 \input texinfo.tex
 @c{-*-tm manual-*-}
 @setfilename tm_en.info
-@settitle{tm manual}
+@settitle tm manual
 
 @titlepage
-@title{tm Manual (English Version)}
-@author{by MORIOKA Tomohiko}
-@code{$Id: tm_en.texi,v 6.1 1995/08/01 18:48:29 morioka Exp $}
+@title tm Manual (English Version)
+@author by MORIOKA Tomohiko
+@code{$Id: tm_en.texi,v 6.2 1995/08/12 08:45:35 morioka Exp $}
 @end titlepage
 
 
 @node Top, List of modules, (dir), (dir)
 @comment  node-name,  next,  previous,  up
-@chapter{tm}
-@cindex{tm}
+@chapter tm
+@cindex tm
 
 The tm package is a set of modules to enjoy MIME on GNU Emacs.  Using tm,
 you can
@@ -43,8 +43,8 @@ and more.
 
 @node List of modules, Emacs Versions, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter{List of modules}
-@cindex{List of modules}
+@chapter List of modules
+@cindex List of modules
 
 The tm package includes the modules listed below.
 
@@ -73,18 +73,18 @@ The tm package includes the modules listed below.
 
 @node Emacs Versions, Install, List of modules, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Considerations for each emacs variants}
-@cindex{Considerations for each emacs variants}
+@chapter Considerations for each emacs variants
+@cindex Considerations for each emacs variants
 
-@section{original GNU Emacs 18}
+@section original GNU Emacs 18
 
 I can not guarantee, but you may use US-ASCII only.
 
-@section{NEmacs, NEpoch}
+@section NEmacs, NEpoch
 
 ISO-2022-JP and US-ASCII can be used if you use NEmacs.
 
-@section{original GNU Emacs 19}
+@section original GNU Emacs 19
 
 US-ASCII and ISO-8859-1 can be used if you use the original Emacs
 19.*.
@@ -93,7 +93,7 @@ When emacs is running with own window in X window environment, tm-rich
 displays multi face for text/richtext and text/enriched richtext
 messages.
 
-@section{Mule}
+@section Mule
 
 Mule can handle the multi-lingual text.  With Mule, tiny-mime supports
 ISO-2022-JP, ISO-2022-JP-2, US-ASCII, ISO-8859-1..9, ISO-2022-CN,
@@ -105,21 +105,21 @@ When Mule 2.* is running with own window in X window environment,
 tm-rich displays multi face for text/richtext and text/enriched
 richtext messages.
 
-@section{XEmacs}
+@section XEmacs
 
 US-ASCII and ISO-8859-1 can be used if you use the XEmacs.
 
 In future, we will support multi face and inline image.
 
 
-@node Install, Setting, Emacs-Versions, Top
+@node Install, Setting, Emacs Versions, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Install}
-@cindex{Install}
+@chapter Install
+@cindex Install
 
 You can install tm by following the procedures below.
 
-@section{tl install}
+@section tl install
 
 tm requires the Emacs Lisp library ``tl'', so please install this at
 first.
@@ -127,11 +127,11 @@ first.
 How to install tl is written in tl/README.eng.
 
 
-@section{Makefile}
+@section Makefile
 
 Please modify Makefile to your environment.
 
-@subsection{Specification executable file name of emacs}
+@subsection Specification executable file name of emacs
 
 Please specify executable file name of emacs.
 
@@ -142,7 +142,7 @@ Please specify executable file name of emacs.
 @item MULE2	= for MULE 2.* (based on Emacs 19.*)
 @end itemize
 
-@subsection{Specification load-path}
+@subsection Specification load-path
 
 Please specify directory to install Emacs Lisp program.
 
@@ -152,22 +152,22 @@ Please specify directory to install Emacs Lisp program.
 @end itemize
 
 
-@section{External method}
+@section External method
 
 Please modify method script in tm/methods/ to your environment.
 
 
-@section{make}
+@section make
 
 Run `make all'.
 
 
-@section{install}
+@section install
 
 Run `make install'.
 
 
-@section{install Emacs Lisp program}
+@section install Emacs Lisp program
 
 Run `make install-nemacs', if you use NEmacs or NEpoch.
 
@@ -182,15 +182,15 @@ Or copy *.el to your emacs lisp directory.
 
 @node Setting, tm-MUA, Install, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Setting}
-@cindex{Setting}
+@chapter Setting
+@cindex Setting
 
 In the tm package, two files, mime-setup.el and tm-setup.el, are provided
 to ease the setup. A mime-setup.el is used for the whole MIME related
 setup including MIME encoding, while tm-setup is used to set up tm-MUA
 only.
 
-@section{mime-setup}
+@section mime-setup
 
 @lisp
 (load "mime-setup")
@@ -219,7 +219,7 @@ mime-setup requires mime.el. if you set up SuperCite via mime-setup,
 you need the SuperCite package also.
 
 
-@section{tm-setup}
+@section tm-setup
 
 tm-setup only sets up tm-MUAs.  You do not need to explicitly load
 tm-setup if you are using mime-setup for your setup.  tm-setup is useful
@@ -230,7 +230,7 @@ when you do not want to use mime-setup but want to set up tm-MUAs.
 @end lisp
 
 
-@section{vm}
+@section vm
 
 If you use vm, please insert following in .vm or .emacs.
 
@@ -239,7 +239,7 @@ If you use vm, please insert following in .vm or .emacs.
 @end lisp
 
 
-@section{setting up without loading provided setup files}
+@section setting up without loading provided setup files
 
 You may find the valuable hints in tm-setup.el if you want to set up
 MIME environment without loading the tm-provided setup files.
@@ -247,8 +247,8 @@ MIME environment without loading the tm-provided setup files.
 
 @node tm-MUA, Bug report, Setting, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tm-MUA}
-@cindex{tm-MUA}
+@chapter tm-MUA
+@cindex tm-MUA
 
 ``tm-MUA'' is a generic name of the modules which enhance the MIME
 functions of MUA like mh-e, GNUS, and RMAIL etc.
@@ -266,7 +266,7 @@ You can find the detailed explanations of these modules in the
 following sections.
 
 
-@section{Summary mode}
+@section Summary mode
 
 If you are using tm-MUA, the following functions are added to the
 Summary mode of the MUA.
@@ -295,9 +295,9 @@ setting.
 
 @node Bug report, Concept Index, tm-MUA, Top
 @comment  node-name,  next,  previous,  up
-@chapter{How to report bug and about mailing list of tm}
-@cindex{bug report}
-@cindex{mailing list}
+@chapter How to report bug and about mailing list of tm
+@cindex bug report
+@cindex mailing list
 
 Please report tm bugs you find to fj.editor.emacs or send a mail to
 tm ML:
@@ -342,7 +342,7 @@ the mail body in human-recognizable language. (^_^)
 @printindex fn
 
 
-@node Variable Index, Top, Command Index, Top
+@node Variable Index, , Command Index, Top
 @unnumbered Variable Index
 
 @printindex vr
diff --git a/mh-e/Makefile b/mh-e/Makefile
index e673615..63d5fb2 100644
--- a/mh-e/Makefile
+++ b/mh-e/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 6.0 1995/05/19 11:43:49 morioka Exp morioka $
+# $Id: Makefile,v 6.2 1995/08/14 17:06:55 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -8,10 +8,7 @@
 #	ORIG19	= for Emacs 19.* (FSF original or XEmacs)
 #	MULE2	= for MULE 2.* (based on Emacs 19.*)
 
-NEMACS	= nemacs
-MULE1	= mule1
-ORIG19	= emacs19
-MULE2	= mule2
+EMACS	= mule
 
 
 # Please specfy Emacs Lisp install directory:
@@ -25,30 +22,18 @@ TMDIR18	= $(HOME)/lib/emacs18/lisp
 TMDIR19	= $(HOME)/lib/emacs19/lisp
 
 
-FILES	= tm/mh-e/*.el tm/mh-e/Makefile*
+FILES	= tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
 TARFILE = tm-mh-e6.5.tar
 
 
-nemacs:
-	make -f Makefile.bc tm-mh-e.elc EMACS=$(NEMACS)
-
-mule1:
-	make -f Makefile.bc tm-mh-e.elc EMACS=$(MULE1)
+elc:
+	$(EMACS) -batch -l mk-tmh -f compile-tm-mh-e
 
 install-18:
-	../inst-el $(TMDIR18) tm-mh-e*.el
-	../inst-elc $(TMDIR18) tm-mh-e*.elc
-
-
-orig19:
-	make -f Makefile.bc mh-e4 EMACS=$(ORIG19)
-
-mule2:
-	make -f Makefile.bc mh-e4 EMACS=$(MULE2)
+	$(EMACS) -batch -l mk-tmh -f install-tm-mh-e $(TMDIR18)
 
 install-19:
-	../inst-el $(TMDIR19) tm-mh-e*.el
-	../inst-elc $(TMDIR19) tm-mh-e*.elc
+	$(EMACS) -batch -l mk-tmh -f install-tm-mh-e $(TMDIR19)
 
 
 clean:
diff --git a/mh-e/mk-tmh b/mh-e/mk-tmh
new file mode 100644
index 0000000..4d2fa1b
--- /dev/null
+++ b/mh-e/mk-tmh
@@ -0,0 +1,75 @@
+;;; -*-Emacs-Lisp-*-
+
+(setq load-path (append
+		 (mapcar (function
+			  (lambda (path)
+			    (expand-file-name path (getenv "PWD"))
+			    ))
+			 '("." ".." "../../tl/" "../../mel/")
+			 )
+		 load-path))
+
+(require 'mh-e)
+
+(setq tm-mh-e-modules
+      (append
+       '("tm-mh-e")
+       (if (not (boundp 'mh-e-version))
+	   '("tm-mh-e3")
+	 )
+       ))
+
+(setq tm-mh-e-el-files
+      (mapcar (function (lambda (module)
+			  (concat module ".el")
+			  ))
+	      tm-mh-e-modules))
+
+(setq tm-mh-e-elc-files
+      (mapcar (function (lambda (module)
+			  (concat module ".elc")
+			  ))
+	      tm-mh-e-modules))
+
+(defun compile-tm-mh-e ()
+  (mapcar (function byte-compile-file) tm-mh-e-el-files)
+  )
+
+(defconst el-file-mode (+ (* 64 6)(* 8 4) 4))
+
+(defun install-el (path file)
+  (let ((full-path (expand-file-name file path)))
+    (if (file-exists-p full-path)
+	(set-file-modes full-path el-file-mode)
+      )
+    (copy-file file full-path t t)
+    (princ (format "%s -> %s\n" file path))
+    ))
+
+(defun install-el-files (path &rest files)
+  (mapcar (function (lambda (file)
+		      (if (file-exists-p file)
+			  (install-el path file)
+			)))
+	  files))
+
+(defun install-elc (path file)
+  (let ((full-path (expand-file-name file path)))
+    (copy-file file full-path t t)
+    (delete-file file)
+    (princ (format "%s -> %s\n" file path))
+    ))
+
+(defun install-elc-files (path &rest files)
+  (mapcar (function (lambda (file)
+		      (if (file-exists-p file)
+			  (install-elc path file)
+			)))
+	  files))
+
+(defun install-tm-mh-e ()
+  (let ((path (car command-line-args-left)))
+    (princ (format "%s\n" emacs-version))
+    (apply (function install-el-files) path tm-mh-e-el-files)
+    (apply (function install-elc-files) path tm-mh-e-elc-files)
+    ))
diff --git a/mk-tm b/mk-tm
index 32c7e97..df145e8 100644
--- a/mk-tm
+++ b/mk-tm
@@ -1,4 +1,4 @@
-;;; -*-Emacs-Lisp-*-tm
+;;; -*-Emacs-Lisp-*-
 
 (setq load-path (append
 		 (mapcar (function
@@ -9,8 +9,6 @@
 			 )
 		 load-path))
 
-(print load-path)
-
 (require 'tl-misc)
 (require 'gnus)
 (require 'tm-rich)
@@ -42,12 +40,25 @@
 		"richtext"
 		)
 	      '("tm-rich")
-	      ))
-	 '("tm-vm")
-	 )))
+	      )))
+       ))
 
 (setq tm-uncompile-el-files '("tm-partial.el"))
 
+(if (catch 'tag
+      (let ((paths load-path) path)
+	(while paths
+	  (setq path (expand-file-name "vm.el" (car paths)))
+	  (if (file-exists-p path)
+	      (throw 'tag path)
+	    )
+	  (setq paths (cdr paths))
+	  )))
+    (setq tm-modules (append tm-modules '("tm-vm")))
+  (setq tm-uncompile-el-files
+	(append tm-uncompile-el-files '("tm-vm.el")))
+  )
+
 (setq tm-el-files
       (mapcar (function (lambda (module)
 			  (concat module ".el")
diff --git a/tm-view.el b/tm-view.el
index ee8dce3..547762c 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -21,7 +21,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.71 1995/08/03 21:21:16 morioka Exp $")
+  "$Id: tm-view.el,v 6.72 1995/08/12 18:58:45 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -540,9 +540,6 @@ it is regarded as current-buffer. [tm-view]"
     (setq mime::preview/original-major-mode mode)
     (setq major-mode 'mime/viewer-mode)
     (setq mode-name "MIME-View")
-    (make-variable-buffer-local 'outline-regexp)
-    ;;(setq outline-regexp "\\[.*\\]\\|\C-L")
-    ;;(outline-minor-mode t)
     (setq dest
 	  (mapcar
 	   (function
@@ -580,6 +577,7 @@ it is regarded as current-buffer. [tm-view]"
 			    (funcall f)
 			  (mime-viewer/default-content-header-filter)
 			  ))
+		      (run-hooks 'mime-viewer/content-header-filter-hook)
 		      (switch-to-buffer the-buf)
 		      ))
 		(if (mime-viewer/body-visible-p cnum cinfo ctype)