From: morioka <morioka>
Date: Mon, 9 Mar 1998 07:22:22 +0000 (+0000)
Subject: tm 6.78.1.
X-Git-Tag: tm6_78_1~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b47099f9bfa62e367a563f0009cac66938c7d66;p=elisp%2Ftm.git

tm 6.78.1.
---

diff --git a/Changes-6.78.1.en b/Changes-6.78.1.en
new file mode 100644
index 0000000..c4390c5
--- /dev/null
+++ b/Changes-6.78.1.en
@@ -0,0 +1,50 @@
+* tl
+
+  Attached version 6.6.1.
+
+tl/emu-18.el
+----------------------------
+revision 4.0
+date: 1995/09/05 16:44:57;  author: morioka;  state: Exp;  lines: +40 -1
+Created function `make-directory-internal' and function
+`make-directory'.
+----------------------------
+
+
+* mel
+
+  Attached version 1.8.1.
+
+	- Fixed mk-mel.
+
+
+* tm
+
+	- Installer was changed.
+	- Fixed TeXinfo files.
+
+tm/mime-setup.el
+----------------------------
+revision 6.2
+date: 1995/09/06 10:07:26;  author: morioka;  state: Exp;  lines: +105 -72
+(1) Defined variable `mime-setup-use-signature'. If it is nil,
+    mime-setup.el does not set up for signature.el.
+(2) Defined variable `mime-setup-signature-key' to set key to bind
+    insert-signature.
+(3) Stopped every header encoding by mime.el.
+(4) Set up for extended mime-mode features by tm-comp.
+----------------------------
+
+
+* tm/gnus
+
+  Attached version 6.20.1.
+
+	- Fixed mk-tgnus.
+
+
+* tm/mh-e
+
+  Attached version 6.24.1.
+
+	- Fixed mk-tmh.
diff --git a/Changes-6.78.1.ja b/Changes-6.78.1.ja
new file mode 100644
index 0000000..d51e1f2
--- /dev/null
+++ b/Changes-6.78.1.ja
@@ -0,0 +1,50 @@
+* tl
+
+  Version 6.6.1 $B$rE:IU$7$?!#(B
+
+tl/emu-18.el
+----------------------------
+revision 4.0
+date: 1995/09/05 16:44:57;  author: morioka;  state: Exp;  lines: +40 -1
+$B4X?t(B make-directory-internal $B$H4X?t(B make-directory $B$rDI2C$7$?!#(B
+----------------------------
+
+
+* mel
+
+  Version 1.8.1 $B$rE:IU$7$?!#(B
+
+	- mk-mel $B$r=$@5$7$?!#(B
+
+
+* tm
+
+	- installer $B$NJ}<0$rJQ99$7$?!#(B
+	- TeXinfo $BHG@bL@=q$r=$@5$7$?!#(B
+
+tm/mime-setup.el
+----------------------------
+revision 6.2
+date: 1995/09/06 10:07:26;  author: morioka;  state: Exp;  lines: +105 -72
+(1) $BJQ?t(B mime-setup-use-signature $B$rDj5A$7!"$3$l$,(B nil $B$N;~$O(B
+    signature.el $B$N@_Dj$r9T$J$o$J$$$h$&$K$7$?!#(B
+(2) $BJQ?t(B mime-setup-signature-key $B$rDj5A$7!"(Binsert-signature $B$r(B bind
+    $B$9$k(B key $B$r@_Dj$G$-$k$h$&$K$7$?!#(B
+(3) mime.el $B$G$O0l@Z(B header $B$N(B encode $B$r9T$J$o$J$$$h$&$K$7$?!#(B
+(4) tm-comp $B$r(B load $B$7$F$$$k;~$O!"(Btm-comp $B$G3HD%$5$l$?(B mime-mode $B$N5!(B
+    $BG=$r;H$C$?@_Dj$r9T$J$&$h$&$K$7$?!#(B
+----------------------------
+
+
+* tm/gnus
+
+  Version 6.20.1 $B$rE:IU$7$?!#(B
+
+	- mk-tgnus $B$r=$@5$7$?!#(B
+
+
+* tm/mh-e
+
+  Version 6.24.1 $B$rE:IU$7$?!#(B
+
+	- mk-tmh $B$r=$@5$7$?!#(B
diff --git a/Makefile b/Makefile
index 53994f3..20b0717 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,14 @@
 #
-# $Id: Makefile,v 6.25 1995/09/04 00:51:33 morioka Exp morioka $
+# $Id: Makefile,v 6.27 1995/09/05 17:35:24 morioka Exp morioka $
 #
 
-# Please specify emacs executables:
-#	NEMACS	= for NEMACS (or NEpoch)
-#	MULE1	= for Mule 1.* (based on Emacs 18.*)
-#	ORIG19	= for Emacs 19.* (FSF original or XEmacs)
-#	MULE2	= for MULE 2.* (based on Emacs 19.*)
-
-NEMACS	= nemacs
-MULE1	= mule1
-ORIG19	= emacs19
-MULE2	= mule2
-
-# Please specify Emacs Lisp install directory:
-# TMDIR18 = for Emacs 18.* (NEMACS, NEpoch or MULE 1)
-# TMDIR19 = for Emacs 19.* (FSF original, XEmacs or MULE 2)
-
-#TMDIR18 = /usr/local/lib/emacs/local.lisp/tm
-#TMDIR19 = /usr/local/lib/mule/site-lisp
-
-TMDIR18 = $(HOME)/lib/emacs18/lisp
-TMDIR19 = $(HOME)/lib/emacs19/lisp
-
-# Please specify optional load-path
-NEMACS_OPT = /usr/local/lib/nemacs/local.lisp
-MULE1_OPT  = /usr/local/lib/mule/local.lisp
-ORIG19_OPT =
-MULE2_OPT =
-
-bindir	= $(HOME)/bin
-
-CC	= gcc
-CFLAGS	= -O
-
-RM	= /bin/rm -f
-CP	= /bin/cp -p
+include config.tm
 
 UTILS	= ol2 decode-b
 GOMI	= $(UTILS) *.elc loadpath
 
 TM_FILES = tm/README.eng tm/rel-*.ol tm/Changes* \
-		tm/Makefile tm/mk-tm \
+		tm/config.tm tm/Makefile tm/mk-tm \
 		tm/tm-view.el tm/tiny-mime.el \
 		tm/tm-mule.el tm/tm-nemacs.el tm/tm-orig.el tm/tm-def.el \
 		tm/tm-ftp.el tm/tm-latex.el tm/tm-partial.el \
@@ -67,7 +34,7 @@ TL_FILES = tl/README.eng \
 
 FILES	= $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm6.78.tar
+TARFILE = tm6.78.1.tar
 
 
 nemacs:
@@ -78,11 +45,15 @@ nemacs:
 	cd mh-e; PWD=`pwd` make elc EMACS=$(NEMACS)
 
 install-nemacs:	nemacs
-	cd ../tl; PWD=`pwd` make install-nemacs NEMACS=$(NEMACS)
-	cd ../mel; PWD=`pwd` make install-18 EMACS=$(NEMACS)
+	cd ../tl; PWD=`pwd` \
+		make install-nemacs NEMACS=$(NEMACS) TLDIR18=$(TLDIR18)
+	cd ../mel; PWD=`pwd` \
+		make install-18 EMACS=$(NEMACS) MELDIR18=$(MELDIR18)
 	$(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)
+	cd gnus; PWD=`pwd` \
+		make install-18 EMACS=$(NEMACS) TMDIR18=$(TM_GNUS_DIR18)
+	cd mh-e; PWD=`pwd` \
+		make install-18 EMACS=$(NEMACS) TMDIR18=$(TMH_DIR18)
 
 
 mule1:
@@ -93,11 +64,15 @@ mule1:
 	cd mh-e; PWD=`pwd` make elc EMACS=$(MULE1)
 
 install-mule1:	mule1
-	cd ../tl; PWD=`pwd` make install-mule1 MULE1=$(MULE1)
-	cd ../mel; PWD=`pwd` make install-18 EMACS=$(MULE1)
+	cd ../tl; PWD=`pwd` \
+		make install-mule1 MULE1=$(MULE1) TLDIR18=$(TLDIR18)
+	cd ../mel; PWD=`pwd` \
+		make install-18 EMACS=$(MULE1) MELDIR18=$(MELDIR18)
 	$(MULE1) -batch -l mk-tm -f install-tm $(TMDIR18)
-	cd gnus; PWD=`pwd` make install-18 EMACS=$(MULE1) TMDIR18=$(TMDIR18)
-	cd mh-e; PWD=`pwd` make install-18 EMACS=$(MULE1) TMDIR18=$(TMDIR18)
+	cd gnus; PWD=`pwd` \
+		make install-18 EMACS=$(MULE1) TMDIR18=$(TM_GNUS_DIR18)
+	cd mh-e; PWD=`pwd` \
+		make install-18 EMACS=$(MULE1) TMDIR18=$(TMH_DIR18)
 
 
 orig19:
@@ -112,11 +87,15 @@ orig19:
 	cd mh-e; PWD=`pwd` make elc EMACS=$(ORIG19)
 
 install-orig19:	orig19
-	cd ../tl; PWD=`pwd` make install-orig19 ORIG19=$(ORIG19)
-	cd ../mel; PWD=`pwd` make install-19 EMACS=$(ORIG19)
+	cd ../tl; PWD=`pwd` \
+		make install-orig19 ORIG19=$(ORIG19) TLDIR19=$(TLDIR19)
+	cd ../mel; PWD=`pwd` \
+		make install-19 EMACS=$(ORIG19) MELDIR19=$(MELDIR19)
 	$(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)
+	cd gnus; PWD=`pwd` \
+		make install-19 EMACS=$(ORIG19) TMDIR19=$(TM_GNUS_DIR19)
+	cd mh-e; PWD=`pwd` \
+		make install-19 EMACS=$(ORIG19) TMDIR19=$(TMH_DIR19)
 
 
 mule2:
@@ -131,11 +110,15 @@ mule2:
 	cd mh-e; PWD=`pwd` make elc EMACS=$(MULE2)	
 
 install-mule2:	mule2
-	cd ../tl; PWD=`pwd` make install-mule2 MULE2=$(MULE2)
-	cd ../mel; PWD=`pwd` make install-19 EMACS=$(MULE2)
+	cd ../tl; PWD=`pwd` \
+		make install-mule2 MULE2=$(MULE2) TLDIR19=$(TLDIR19)
+	cd ../mel; PWD=`pwd` \
+		make install-19 EMACS=$(MULE2) MELDIR19=$(MELDIR19)
 	$(MULE2) -batch -l mk-tm -f install-tm $(TMDIR19)
-	cd gnus; PWD=`pwd` make install-19 EMACS=$(MULE2) TMDIR19=$(TMDIR19)
-	cd mh-e; PWD=`pwd` make install-19 EMACS=$(MULE2) TMDIR19=$(TMDIR19)
+	cd gnus; PWD=`pwd` \
+		make install-19 EMACS=$(MULE2) TMDIR19=$(TM_GNUS_DIR19)
+	cd mh-e; PWD=`pwd` \
+		make install-19 EMACS=$(MULE2) TMDIR19=$(TMH_DIR19)
 
 
 all:	$(UTILS) $(DVI)
diff --git a/config.tm b/config.tm
new file mode 100644
index 0000000..37605ec
--- /dev/null
+++ b/config.tm
@@ -0,0 +1,74 @@
+#
+# tm/config.tm: configuration file for tm
+#
+
+# Please specify emacs executables:
+#	NEMACS	= for NEMACS (or NEpoch)
+#	MULE1	= for Mule 1.* (based on Emacs 18.*)
+#	ORIG19	= for Emacs 19.* (FSF original or XEmacs)
+#	MULE2	= for MULE 2.* (based on Emacs 19.*)
+
+NEMACS	= nemacs
+MULE1	= mule1
+ORIG19	= emacs19
+MULE2	= mule2
+
+
+# Please specify location to install for Emacs 18.
+
+# PREFIX_18 = /usr/local/lib/emacs/local.lisp
+
+PREFIX_18 = $(HOME)/lib/emacs18/lisp
+
+
+# Please specify location to install for Emacs 19.
+
+# PREFIX_19 = /usr/local/lib/emacs/site-lisp
+
+PREFIX_19 = $(HOME)/lib/emacs19/lisp
+
+
+# tl install directory for Emacs 18
+TLDIR18 = $(PREFIX_18)
+
+# tl install directory for Emacs 19
+TLDIR19 = $(PREFIX_19)
+
+
+# MEL install directory for Emacs 18
+MELDIR18 = $(PREFIX_18)/tm
+
+# MEL install directory for Emacs 19
+MELDIR19 = $(PREFIX_19)
+
+
+# tm install directory for Emacs 18
+TMDIR18 = $(PREFIX_18)/tm
+
+# tm install directory for Emacs 19
+TMDIR19 = $(PREFIX_19)
+
+
+# tm-mh-e install directory for Emacs 18
+TMH_DIR18 = $(TMDIR18)
+
+# tm-mh-e install directory for Emacs 19
+TMH_DIR19 = $(TMDIR19)
+
+
+# tm-gnus install directory for Emacs 18
+TM_GNUS_DIR18 = $(TMDIR18)
+
+# tm-gnus install directory for Emacs 19
+TM_GNUS_DIR19 = $(TMDIR19)
+
+
+bindir	= $(HOME)/bin
+
+
+CC	= gcc
+CFLAGS	= -O
+
+
+RM	= /bin/rm -f
+CP	= /bin/cp -p
diff --git a/doc/tm-eword_ja.texi b/doc/tm-eword_ja.texi
index fabe28e..1430a2c 100644
--- a/doc/tm-eword_ja.texi
+++ b/doc/tm-eword_ja.texi
@@ -6,12 +6,15 @@
 @titlepage
 @title{tiny-mime Manual¡ÊÆüËܸìÈÇ¡Ë}
 @author{¼é²¬ ÃÎɧ Ãø}
-@code{$Id: tm-eword_ja.texi,v 3.0 1995/08/01 19:06:41 morioka Exp $}
+@code{$Id: tm-eword_ja.texi,v 4.0 1995/09/05 17:50:57 morioka Exp $}
 @end titlepage
 
 
 @node Top, Abstract, (tm_ja.info)Abstract, (tm_ja.info)Abstract
 @comment  node-name,  next,  previous,  up
+@ifinfo
+@top tiny-mime 6.6 Reference manual
+@end ifinfo
 
 @ifinfo
 tm ¤Ë¤ª¤±¤ë MIME header ¤Î encoder/decoder ¤Ç¤¢¤ë tiny-mime ¤Ë¤Ä¤¤¤ÆÀâ
@@ -21,7 +24,7 @@ tm 
 @menu
 * Abstract::   tiny-mime ¤È¤Ï
 * Charsets::   tiny-mime ¤Î¥µ¥Ý¡¼¥È¤¹¤ë charset
-* How-to-use:: tiny-mime ¤Î´Êñ¤Ê»È¤¤Êý
+* How to use:: tiny-mime ¤Î´Êñ¤Ê»È¤¤Êý
 * Functions::  tiny-mime ¤Î´Ø¿ô
 * Variables::  tiny-mime ¤ÎÊÑ¿ô
 * Customize::  charset ¤ÎÄɲÃ
@@ -34,8 +37,8 @@ tm 
 
 @node Abstract, Charsets, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tiny-mime ¤È¤Ï}
-@cindex{tiny-mime ¤È¤Ï}
+@chapter tiny-mime ¤È¤Ï
+@cindex tiny-mime ¤È¤Ï
 
 tiny-mime ¤Ï tm ¤Ë¤ª¤±¤ë MIME header (RFC 1522) ¤Î encoder/decoder ¤Ç¤¹¡£
 
@@ -47,28 +50,28 @@ MIME message header 
 ¤ì¤Æ¤¤¤Þ¤¹¡£
 
 
-@node Charsets, How-to-use, Abstract, Top
+@node Charsets, How to use, Abstract, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tiny-mime ¤Î¥µ¥Ý¡¼¥È¤¹¤ë charset}
-@cindex{tiny-mime ¤Î¥µ¥Ý¡¼¥È¤¹¤ë charset}
+@chapter tiny-mime ¤Î¥µ¥Ý¡¼¥È¤¹¤ë charset
+@cindex charset
 
-@section{original GNU Emacs 18}
+@section original GNU Emacs 18
 
 Æ°ºî¤ÏÊݾڤ·¤Þ¤»¤ó¡£¤·¤«¤·¤Ê¤¬¤é¡¢US-ASCII ¤ÎÈϰϤǤÏÆ°ºî¤¹¤ë¤È»×¤ï¤ì
 ¤Þ¤¹¡£¡Ê¤¢¤Þ¤ê°ÕÌ£¤¬¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¤¬¡Ë
 
-@section{NEmacs, NEpoch}
+@section NEmacs, NEpoch
 
 ISO-2022-JP, US-ASCII ¤Î encoding/decoding ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
 
 ¤Þ¤¿¡¢ISO-8859-*¤Ç¤¢¤Ã¤Æ¤â¡¢encoded-text ¤Ë´Þ¤Þ¤ì¤ëʸ»úÎó¤¬¼ÂºÝ¤Ë¤Ï 
 ASCII ¤Çɽ¤»¤ëÈϰϤʤéɽ¼¨¤·¤Þ¤¹¡£
 
-@section{original GNU Emacs 19}
+@section original GNU Emacs 19
 
 US-ASCII ¤ª¤è¤Ó ISO-8859-1 ¤Î encoding/decoding ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
 
-@section{Mule}
+@section Mule
 
 ISO-2022-JP, US-ASCII, ISO-8859-1..9, ISO-2022-CN, ISO-2022-KR, EUC-KR 
 ¤Ê¤É¤Î encoding/decoding ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤Þ¤¿¡¢´Ø¿ô 
@@ -76,12 +79,13 @@ mime/set-charset-and-encoding 
 (@xref{Customize})
 
 
-@node How-to-use, Functions, Charsets, Top
+@node How to use, Functions, Charsets, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tiny-mime ¤Î´Êñ¤Ê»È¤¤Êý}
-@cindex{tiny-mime ¤Î´Êñ¤Ê»È¤¤Êý}
+@chapter tiny-mime ¤Î´Êñ¤Ê»È¤¤Êý
+@cindex encode
+@cindex decode
 
-@section{decode}
+@section decode
 
 tiny-mime.el ¤ò load ¤·¤Æ¡¢decode ¤·¤¿¤¤ buffer ¾å¤Ç¡¢
 
@@ -101,7 +105,7 @@ tiny-mime.el 
 encoded-word ¤ò decode ¤¹¤ë¤Î¤ËÊØÍø¤Ç¤·¤ç¤¦¡£
 
 
-@section{encode}
+@section encode
 
 tiny-mime.el ¤ò load ¤·¤Æ¡¢encode ¤·¤¿¤¤ buffer ¾å¤Ç¡¢
 
@@ -112,10 +116,10 @@ tiny-mime.el 
 ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
 
 
-@node Functions, Variables, How-to-use, Top
+@node Functions, Variables, How to use, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tiny-mime ¤Î´Ø¿ô}
-@cindex{tiny-mime ¤Î´Ø¿ô}
+@chapter tiny-mime ¤Î´Ø¿ô
+@cindex tiny-mime ¤Î´Ø¿ô
 
 @deffn{Command} mime/decode-message-header
 
@@ -142,8 +146,8 @@ encoded-word 
 
 @node Variables, Customize, Functions, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tiny-mime ¤ÎÊÑ¿ô}
-@cindex{tiny-mime ¤ÎÊÑ¿ô}
+@chapter tiny-mime ¤ÎÊÑ¿ô
+@cindex tiny-mime ¤ÎÊÑ¿ô
 
 @defvr{Variable} mime/no-encoding-header-fields
 
@@ -175,10 +179,10 @@ default 
 @end defvr
 
 
-@node Customize, Integrate-into-MUA, Variable, Top
+@node Customize, Integrate-into-MUA, Variables, Top
 @comment  node-name,  next,  previous,  up
-@section{charset ¤ÎÄɲá¦Êѹ¹}
-@cindex{charset ¤ÎÄɲá¦Êѹ¹}
+@chapter charset ¤ÎÄɲá¦Êѹ¹
+@cindex charset ¤ÎÄɲá¦Êѹ¹
 
 Mule ¤Ç¤Ï¡¢´Ø¿ô @code{mime/set-charset-and-encoding} ¤Ç¡¢charset ¤ÎÄÉ
 ²Ã¡¦Êѹ¹¤¬¤Ç¤­¤Þ¤¹¡£
@@ -204,10 +208,10 @@ encode 
 @end deffn
 
 
-@node Integrate-into-MUA, Top, Customize, Top
+@node Integrate-into-MUA, Concept Index, Customize, Top
 @comment  node-name,  next,  previous,  up
-@chapter{MUA ¤Ø¤ÎÁȤ߹þ¤ß}
-@cindex{MUA ¤Ø¤ÎÁȤ߹þ¤ß}
+@chapter MUA ¤Ø¤ÎÁȤ߹þ¤ß
+@cindex MUA ¤Ø¤ÎÁȤ߹þ¤ß
 
 Æü¾ïŪ¤Ë¡¢Ìµ°Õ¼±¤Ë MIME header ¤òËÜÍè¤Î¸À¸ì¤Ç¸«¤¿¤¤¤È¤¤¤¦¤Î¤ÏÅöÁ³¤Î
 Íßµá¤Ç¤¹¡£¤½¤³¤Ç¡¢tiny-mime.el ¤ò mailer ¤ä news reader ¤ËÁȤ߹þ¤à¤È¼«
@@ -227,8 +231,8 @@ mime/decode-message-header 
 @end menu
 
 
-@section{Í­ÍѤʴؿô}
-@cindex{Í­ÍѤʴؿô}
+@section Í­ÍѤʴؿô
+@cindex Í­ÍѤʴؿô
 
 @deffn{Function} mime/decode-string STRING
 
@@ -249,7 +253,7 @@ STRING 
 @printindex fn
 
 
-@node Variable Index, Top, Command Index, Top
+@node Variable Index,  , Command Index, Top
 @unnumbered ÊÑ¿ôº÷°ú
 
 @printindex vr
diff --git a/doc/tm-gnus_en.texi b/doc/tm-gnus_en.texi
index d633cf1..ea98aa0 100644
--- a/doc/tm-gnus_en.texi
+++ b/doc/tm-gnus_en.texi
@@ -6,36 +6,46 @@
 @titlepage
 @title{tm-gnus}
 @author{MORIOKA Tomohiko}
-@code{$Id: tm-gnus_en.texi,v 1.1 1995/09/02 01:51:58 morioka Exp $}
+@code{$Id: tm-gnus_en.texi,v 3.0 1995/09/05 10:19:13 morioka Exp $}
 @end titlepage
 
 
-@node Top, Components, (tm_en.info)tm-MUA, (tm_en.info)tm-MUA
+@node Top, Introduction, (tm_en.info)tm-MUA, (tm_en.info)tm-MUA
 @comment  node-name,  next,  previous,  up
-@chapter tm-gnus
-@cindex tm-gnus
-
-tm-gnus is a GNUS extender to use tm. It supports GNUS 3.*, GNUS 4.*,
-(ding) GNUS and GNUS 5.*.
+@ifinfo
+@top tm-gnus 6.20 Reference manual
+@end ifinfo
 
 @menu
-* Components:: modules of tm-gnus
-* Features::   Features of tm-gnus
-* Customize::  Customize of tm-gnus
+* Introduction:: modules of tm-gnus
+* Features::     Features of tm-gnus
+* Customize::    Customize of tm-gnus
 * Concept Index::
 * Command Index::
 * Variable Index::
 @end menu
 
 
-@node Components, Features, Top, Top
+@node Introduction, Features, Top, Top
 @comment  node-name,  next,  previous,  up
-@section{modules of tm-gnus}
-@cindex{components}
+@chapter Introduction
+@cindex components
+
+tm-gnus is a GNUS extender to use tm. It supports GNUS 3.*, GNUS 4.*,
+(ding) GNUS and GNUS 5.*.
+
+tm-gnus extends MIME features to GNUS. tm-gnus decodes RFC 1522 MIME
+encoded-word in summary buffer and article buffer, and adds a command
+to preview MIME message using tm-view in summary mode.
+
+In (ding) GNUS and GNUS 5.*, tm-gnus can display MIME preview buffer
+instead of article buffer if you apply a patch to support this
+feature. It is useful for heavy MIME user.
+
 
 tm-gnus has following modules:
 
-@itemize
+@itemize @minus
 @item @strong{tm-gnus}:  setting module for GNUS.
 @item @strong{tm-gnus3}: setting module for GNUS 3.*.
 @item @strong{tm-gnus4}: setting module for GNUS 4.*.
@@ -45,10 +55,10 @@ tm-gnus has following modules:
 @end itemize
 
 
-@node Features,  , Components, Top
+@node Features, Customize, Introduction, Top
 @comment  node-name,  next,  previous,  up
-@section{Features of tm-gnus}
-@cindex{features}
+@chapter Features
+@cindex features
 
 tm-gnus expands following features to GNUS.
 
@@ -61,10 +71,10 @@ tm-gnus expands following features to GNUS.
 
 @node Summary buffer, Summary mode, Features, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Summary buffer decoding}
-@cindex{encoded-word}
-@cindex{RFC 1522}
-@cindex{summary buffer}
+@section Summary buffer decoding
+@cindex encoded-word
+@cindex RFC 1522
+@cindex summary buffer
 
 tm-gnus decodes MIME encoded-word in summary buffer using tiny-mime
 (@inforef{Top, , tm-eword_en}) functions. However if an encoded-word
@@ -77,8 +87,8 @@ has unsupported charset, it is not decoded.
 
 @node Summary mode, Automatic MIME Preview, Summary buffer, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Extension to Summary mode}
-@cindex{Summary mode}
+@section Extension to Summary mode
+@cindex Summary mode
 
 @table @kbd 
 @item @key{M-t}
@@ -99,8 +109,8 @@ message, or play each contents included in a message.
 
 @node Automatic MIME Preview,  , Summary mode, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Automatic MIME Preview}
-@cindex{automatic MIME preview}
+@section Automatic MIME Preview
+@cindex automatic MIME preview
 
 ``Automatic MIME preview'' feature is available to apply ``with tm
 patch'' for (ding) GNUS and GNUS 5.*. This patch is in
@@ -165,8 +175,8 @@ preview mode.
 
 @node Customize, Concept Index, Features, Top
 @comment  node-name,  next,  previous,  up
-@subsection{Customize of tm-gnus}
-@cindex{customize}
+@chapter Customize of tm-gnus
+@cindex customize
 
 @defvar tm-gnus/original-article-display-hook
 
@@ -178,6 +188,7 @@ Notice: it is available after tm-gnus is loaded. Therefore you had
 better to set in @code{call-after-loaded} like following:
 
 @lisp
+@cartouche
 (call-after-loaded
  'tm-view
  (function
@@ -185,6 +196,7 @@ better to set in @code{call-after-loaded} like following:
     (add-hook 'tm-gnus/original-article-display-hook
               ...)
     )))
+@end cartouche
 @end lisp
 @end defvar
 
@@ -193,6 +205,7 @@ setting. For instance, following is a example to add faces using
 hilit19.
 
 @lisp
+@cartouche
 (cond (window-system
        (let* ((header-patterns '(("^Subject:.*$" nil msg-subject)
 				 ("^From:.*$" nil msg-from)
@@ -200,7 +213,7 @@ hilit19.
 				  nil msg-separator)
 				 ("^[A-Za-z][A-Za-z0-9-]+:" nil msg-header)
 				 ))
-	      (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>}|]\\).*$"
+	      (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>@}|]\\).*$"
 				nil msg-quote)))
 	      (message-patterns (append header-patterns body-patterns))
 	      )
@@ -215,6 +228,7 @@ hilit19.
        (add-hook 'mime-viewer/plain-text-preview-hook
 		 (function hilit-rehighlight-buffer-quietly))
        ))
+@end cartouche
 @end lisp
 
 @menu
@@ -222,22 +236,19 @@ hilit19.
 @end menu
 
 
-@node Concept Index, Command Index, Features, Top
-@section{Concept Index}
+@node Concept Index, Command Index, Customize, Top
 @unnumbered Concept Index
 
 @printindex cp
 
 
 @node Command Index, Variable Index, Concept Index, Top
-@section{Command and Function Index}
 @unnumbered Command and Function Index
 
 @printindex fn
 
 
 @node Variable Index,  , Command Index, Top
-@section{Variable Index}
 @unnumbered Variable Index
 
 @printindex vr
diff --git a/doc/tm-gnus_ja.texi b/doc/tm-gnus_ja.texi
index f55c06f..24f2ea9 100644
--- a/doc/tm-gnus_ja.texi
+++ b/doc/tm-gnus_ja.texi
@@ -6,36 +6,47 @@
 @titlepage
 @title{tm-gnus}
 @author{¼é²¬ ÃÎɧ}
-@code{$Id: tm-gnus_ja.texi,v 1.1 1995/09/02 00:32:58 morioka Exp $}
+@code{$Id: tm-gnus_ja.texi,v 3.1 1995/09/05 10:17:18 morioka Exp $}
 @end titlepage
 
 
-@node Top, Components, (tm_ja.info)tm-MUA, (tm_ja.info)tm-MUA
+@node Top, Introduction, (tm_ja.info)tm-MUA, (tm_ja.info)tm-MUA
 @comment  node-name,  next,  previous,  up
-@chapter tm-gnus
-@cindex tm-gnus
-
-tm-gnus ¤Ï GNUS ¤Ç tm ¤ò»È¤¦¤¿¤á¤Î¤â¤Î¤Ç GNUS 3.*, GNUS 4.*, (ding)
-GNUS, GNUS 5.* ¤ÇÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+@ifinfo
+@top tm-gnus 6.20 Reference manual
+@end ifinfo
 
 @menu
-* Components:: tm-gnus ¤Ë´Þ¤Þ¤ì¤ë module
-* Features::   tm-gnus ¤Îµ¡Ç½         
-* Customize::  tm-gnus ¤Î¥«¥¹¥¿¥Þ¥¤¥º
+* Introduction:: ¤Ï¤¸¤á¤Ë
+* Features::     tm-gnus ¤Îµ¡Ç½         
+* Customize::    tm-gnus ¤Î¥«¥¹¥¿¥Þ¥¤¥º
 * Concept Index::
 * Command Index::
 * Variable Index::
 @end menu
 
 
-@node Components, Features, Top, Top
+@node Introduction, Features, Top, Top
 @comment  node-name,  next,  previous,  up
-@section{tm-gnus ¤Ë´Þ¤Þ¤ì¤ë module}
-@cindex{components}
+@chapter ¤Ï¤¸¤á¤Ë
+@cindex components
+
+tm-gnus ¤Ï GNUS ¤Ç tm ¤ò»È¤¦¤¿¤á¤Î¤â¤Î¤Ç GNUS 3.*, GNUS 4.*, (ding)
+GNUS, GNUS 5.* ¤ÇÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+tm-gnus ¤Ï GNUS ¤Î MIME µ¡Ç½¤ò¶¯²½¤·¤Þ¤¹¡£tm-gnus ¤Ï summary buffer ¤È 
+article buffer ¤ÎÃæ¤Ë¤¢¤ë RFC 1522 encoded-word ¤ò decode ¤·¤Þ¤¹¡£¤Þ¤¿¡¢
+summary mode ¤Ë tm-view ¤ò»È¤Ã¤¿ MIME message ¤ò±ÜÍ÷¤¹¤ë¤¿¤á¤Î command 
+¤òÄɲä·¤Þ¤¹¡£
+
+(ding) GNUS ¤È GNUS 5.* ¤Ç¤Ï¡¢¤³¤Îµ¡Ç½¤ò»Ù±ç¤¹¤ë¤¿¤á¤Î patch ¤òÅö¤Æ¤ë
+¤³¤È¤Ç¡¢article buffer ¤ÎÂå¤ï¤ê¤Ë MIME preview buffer ¤òɽ¼¨¤¹¤ë¤³¤È¤¬
+¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï heavy MIME user ¤Ë¤È¤Ã¤ÆÊØÍø¤Ç¤·¤ç¤¦¡£
+
 
-tm-gnus ¤Ë¤Ï°Ê²¼¤Î module ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
+°Ê²¼¤Ë tm-gnus ¤Ë´Þ¤Þ¤ì¤ë module ¤ò¼¨¤·¤Þ¤¹¡£
 
-@itemize
+@itemize @minus
 @item @strong{tm-gnus}:  GNUS ÍѤÎÀßÄê module
 @item @strong{tm-gnus3}: GNUS 3.* ÍѤÎÀßÄê module
 @item @strong{tm-gnus4}: GNUS 4.* ÍѤÎÀßÄê module
@@ -45,10 +56,10 @@ tm-gnus 
 @end itemize
 
 
-@node Features,  , Components, Top
+@node Features, Customize, Introduction, Top
 @comment  node-name,  next,  previous,  up
-@section{tm-gnus ¤Îµ¡Ç½}
-@cindex{features}
+@chapter tm-gnus ¤Îµ¡Ç½
+@cindex features
 
 tm-gnus ¤ò»È¤¦¤È¡¢GNUS ¤Î Summary mode ¤ËÂФ·¤Æ°Ê²¼¤Îµ¡Ç½¤¬Äɲ䵤ì¤Þ
 ¤¹¡£
@@ -62,10 +73,10 @@ tm-gnus 
 
 @node Summary buffer, Summary mode, Features, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Summary buffer ¤Î decode}
-@cindex{encoded-word}
-@cindex{RFC 1522}
-@cindex{summary buffer}
+@section Summary buffer ¤Î decode
+@cindex encoded-word
+@cindex RFC 1522
+@cindex summary buffer
 
 tm-gnus ¤òÍѤ¤¤ë¤È¡¢tiny-mime (@inforef{Top, , tm-eword_ja}) ¤Îµ¡Ç½¤ò
 »È¤Ã¤Æ Summary buffer Ãæ¤Î MIME encoded-word ¤ò decode ¤¹¤ë¤³¤È¤¬¤Ç¤­
@@ -79,8 +90,8 @@ charset 
 
 @node Summary mode, Automatic MIME Preview, Summary buffer, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Summary mode ¤ËÄɲ䵤ì¤ëµ¡Ç½}
-@cindex{Summary mode}
+@section Summary mode ¤ËÄɲ䵤ì¤ëµ¡Ç½
+@cindex Summary mode
 
 @table @kbd 
 @item @key{M-t}
@@ -102,8 +113,8 @@ mime/viewer-mode 
 
 @node Automatic MIME Preview,  , Summary mode, Features
 @comment  node-name,  next,  previous,  up
-@subsection{Automatic MIME Preview}
-@cindex{automatic MIME preview}
+@section Automatic MIME Preview
+@cindex automatic MIME preview
 
 (ding) GNUS ¤ª¤è¤Ó GNUS 5.* ¤Ç¤Ï ``with tm patch'' ¤òÅö¤Æ¤ë¤³¤È¤Ç 
 ``automatic MIME preview'' ¤È¤¤¤¦µ¡Ç½¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î 
@@ -169,8 +180,8 @@ automatic MIME preview mode 
 
 @node Customize, Concept Index, Features, Top
 @comment  node-name,  next,  previous,  up
-@subsection{tm-gnus ¤Î¥«¥¹¥¿¥Þ¥¤¥º}
-@cindex{customize}
+@chapter tm-gnus ¤Î¥«¥¹¥¿¥Þ¥¤¥º
+@cindex customize
 
 @defvar tm-gnus/original-article-display-hook
 
@@ -203,7 +214,7 @@ tm-gnus 
 				  nil msg-separator)
 				 ("^[A-Za-z][A-Za-z0-9-]+:" nil msg-header)
 				 ))
-	      (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>}|]\\).*$"
+	      (body-patterns '(("^\\(In article\\|[ \t]*\\w*[]<>@}|]\\).*$"
 				nil msg-quote)))
 	      (message-patterns (append header-patterns body-patterns))
 	      )
@@ -225,22 +236,19 @@ tm-gnus 
 @end menu
 
 
-@node Concept Index, Command Index, Features, Top
-@section{³µÇ°º÷°ú}
+@node Concept Index, Command Index, Customize, Top
 @unnumbered ³µÇ°º÷°ú
 
 @printindex cp
 
 
 @node Command Index, Variable Index, Concept Index, Top
-@section{´Ø¿ô¡¦¥³¥Þ¥ó¥Éº÷°ú}
 @unnumbered ´Ø¿ô¡¦¥³¥Þ¥ó¥Éº÷°ú
 
 @printindex fn
 
 
 @node Variable Index,  , Command Index, Top
-@section{ÊÑ¿ôº÷°ú}
 @unnumbered ÊÑ¿ôº÷°ú
 
 @printindex vr
diff --git a/doc/tm-view_en.texi b/doc/tm-view_en.texi
index 648adcd..ea2dae6 100644
--- a/doc/tm-view_en.texi
+++ b/doc/tm-view_en.texi
@@ -6,7 +6,7 @@
 @titlepage
 @title tm-view Manual (English Version)
 @author by MORIOKA Tomohiko
-@code{$Id: tm-view_en.texi,v 6.0 1995/09/02 01:49:39 morioka Exp $}
+@code{$Id: tm-view_en.texi,v 6.1 1995/09/05 17:54:42 morioka Exp $}
 @end titlepage
 
 
@@ -218,7 +218,7 @@ in the message.
 
 Second string part represents title. It is created by following:
 
-@itemize
+@itemize @bullet
 @item name paramater or x-name parameter in Content-Type field
 @item Content-Description field or Subject field
 @item filename of uuencode
diff --git a/doc/tm-view_ja.texi b/doc/tm-view_ja.texi
index be54ea2..e9697d1 100644
--- a/doc/tm-view_ja.texi
+++ b/doc/tm-view_ja.texi
@@ -6,14 +6,15 @@
 @titlepage
 @title{tm-view}
 @author{¼é²¬ ÃÎɧ}
-@code{$Id: tm-view_ja.texi,v 6.5 1995/09/02 01:50:37 morioka Exp $}
+@code{$Id: tm-view_ja.texi,v 6.6 1995/09/05 18:07:12 morioka Exp $}
 @end titlepage
 
 
 @node Top, Abstract, (tm_ja.info), (tm_ja.info)
 @comment  node-name,  next,  previous,  up
-
 @ifinfo
+@top tm-view 6.78 Reference manual
+
 GNU Emacs ¤ÇÆ°ºî¤¹¤ëÈÆÍÑŪ¤Ê MIME viewer kernel ¤Î `tm-view' ¤Ë¤Ä¤¤¤Æ
 ÀâÌÀ¤·¤Þ¤¹¡£
 @end ifinfo
@@ -47,8 +48,8 @@ Indexes
 
 @node Abstract, How to run, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tm-view ¤È¤Ï}
-@cindex{tm-view ¤È¤Ï}
+@chapter tm-view ¤È¤Ï
+@cindex tm-view
 
 tm-view ¤Ï GNU Emacs ¤ÇÆ°ºî¤¹¤ëÈÆÍÑŪ¤Ê MIME viewer ¤Ç¤¹¡£
 
@@ -73,7 +74,7 @@ tm-view 
 ¤¬¤Ç¤­¤Þ¤¹¡£
 
 
-@section{¡ÎÃí°Õ¡Ï}
+@section ¡ÎÃí°Õ¡Ï
 
 ¤³¤ÎÀâÌÀ½ñ¤Ç¤Ï¡¢Content-Type field ¤Î content-type/subtype ¤Î¤³¤È¤ò¾Î
 ¤·¤Æ @strong{content-type} ¤È¸Æ¤Ó¤Þ¤¹¡£
@@ -81,8 +82,8 @@ tm-view 
 
 @node How to run, Commands, Abstract, Top
 @comment  node-name,  next,  previous,  up
-@chapter{mime/viewer-mode ¤Îµ¯Æ°¤Î»ÅÊý}
-@cindex{mime/viewer-mode ¤Îµ¯Æ°¤Î»ÅÊý}
+@chapter mime/viewer-mode ¤Îµ¯Æ°¤Î»ÅÊý
+@cindex mime/viewer-mode
 
 @deffn{Command} mime/viewer-mode &optional mother ctl encoding
 
@@ -106,8 +107,8 @@ field 
 
 @node Commands, Preview Buffer, How to run, Top
 @comment  node-name,  next,  previous,  up
-@chapter{mime/viewer-mode ¤Î command}
-@cindex{mime/viewer-mode ¤Î command}
+@chapter mime/viewer-mode ¤Î command
+@cindex command
 
 mime/viewer-mode ¤Ë¤Ï°Ê²¼¤Îµ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£
 
@@ -147,10 +148,10 @@ tm-MUA 
 @end enumerate
 
 
-@node Preview Buffer, content-subject, Commands, Top
+@node Preview Buffer, Decoding, Commands, Top
 @comment  node-name,  next,  previous,  up
-@chapter{preview buffer ¤Î²èÌ̹½À®}
-@cindex{preview buffer ¤Î²èÌ̹½À®}
+@chapter preview buffer ¤Î²èÌ̹½À®
+@cindex preview buffer
 
 preview buffer ¤Ç¤Ï³Æ content ¤ËÂФ·¤Æ
 
@@ -207,8 +208,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 ¤Ï content ¤ÎÀèƬ¤Ë¤¢¤Ã¤Æ¡¢¤½¤Î content ¤Ë´Ø¤¹¤ëÂç¤Þ¤«
 ¤Ê¾ðÊó¤òɽ¼¨¤¹¤ëÉôʬ¤Ç¤¹¡£
@@ -226,11 +227,11 @@ content-subject 
 
 £²ÈÖÌܤÎʸ»úÎó¤ÏɽÂê¤òɽ¤·¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ï¡¢
 
-@itemize
-@item{Content-Type field ¤Î name paramater ¤â¤·¤¯¤Ï x-name parameter ¤Ë½ñ
-  ¤«¤ì¤¿ file ̾}
-@item{Content-Description field ¤â¤·¤¯¤Ï Subject field ¤Ë½ñ¤«¤ì¤¿É½Âê}
-@item{uuencode ¤Î¾ì¹ç¤Î file ̾}
+@itemize @bullet
+@item Content-Type field ¤Î name paramater ¤â¤·¤¯¤Ï x-name parameter 
+¤Ë½ñ¤«¤ì¤¿ file ̾
+@item Content-Description field ¤â¤·¤¯¤Ï Subject field ¤Ë½ñ¤«¤ì¤¿É½Âê
+@item uuencode ¤Î¾ì¹ç¤Î file ̾
 @end itemize
 
 ¤«¤éºî¤ê¤Þ¤¹¡£¤É¤ì¤â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¶õÇò¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
@@ -277,8 +278,8 @@ content-subject ɽ
 
 @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
 
 ¤¢¤ë content ¤Î content-number ¤ò´Ø¿ô 
 @code{mime-viewer/header-visible-p} ¤ËÆþÎϤ·¤Æ¤½¤ÎÊÖ¤êÃͤ¬ @code{t} ¤Ë
@@ -335,8 +336,8 @@ content-header-filter 
 
 @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 ¤Î content-body ¤òɽ¼¨¤¹¤ë¤«¤É¤¦¤«¤Ï¡¢´Ø¿ô 
 @code{mime-viewer/body-visible-p} ¤¬ @code{t} ¤Ë¤Ê¤ë¤«¤É¤¦¤«¤Ç·è¤Þ¤ê¤Þ
@@ -383,10 +384,10 @@ content-filter 
 @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 ¤Ï content ¤Î°ìÈֺǸå¤Ë content ´Ö¤Î¶­ÌܤòÌÀ¤é¤«¤Ë¤¹
 ¤ë¤¿¤á¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
@@ -406,10 +407,10 @@ content-number 
 @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
 
 @code{mime/viewer-mode} ¤Ç¤Ï user ¤Ï³Æ content ¤ËÂФ·¤Æ¡¢play
 (@key{v}), extract (@key{e}), print (@key{C-c C-p}) ¤È¤¤¤¦Áàºî¤ò¹Ô¤Ê¤¦
@@ -438,8 +439,8 @@ Emacs 
 
 @node decoding-condition, Format of method value, Decoding, Decoding
 @comment  node-name,  next,  previous,  up
-@section{content ¤Î decode ¾ò·ï¤ÎÀßÄê}
-@cindex{content ¤Î decode ¾ò·ï¤ÎÀßÄê}
+@section content ¤Î decode ¾ò·ï¤ÎÀßÄê
+@cindex content decoding condition
 
 tm-view ¤Ï decode Áàºî¤¬¹Ô¤Ê¤ï¤ì¤ë¤È¡¢ÊÑ¿ô 
 @code{mime/content-decoding-condition} ¤«¤é¤½¤Î»þ¤Î¾ò·ï¤Ë¹çÃפ·¤¿ 
@@ -496,8 +497,8 @@ decoding-mode 
 
 @node Format of method value, Example of decoding-condition, decoding-condition, Decoding
 @comment  node-name,  next,  previous,  up
-@section{method ¤Î ÃÍÉô¤Î½ñ¼°}
-@cindex{method ¤Î ÃÍÉô¤Î½ñ¼°}
+@section method ¤ÎÃÍÉô¤Î½ñ¼°
+@cindex method ¤ÎÃÍÉô¤Î½ñ¼°
 
 decode-condition ¤Î method field ¤Ï
 
@@ -564,10 +565,10 @@ 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{decoding-condition ¤ÎÎã}
-@cindex{decoding-condition ¤ÎÎã}
+@section decoding-condition ¤ÎÎã
+@cindex decoding-condition ¤ÎÎã
 
 °Ê²¼¤Ë decoding-condition ¤ÎÀßÄêÎã¤ò¼¨¤·¤Þ¤¹¡£
 
diff --git a/doc/tm_en.texi b/doc/tm_en.texi
index 11f9698..883dd8f 100644
--- a/doc/tm_en.texi
+++ b/doc/tm_en.texi
@@ -6,30 +6,19 @@
 @titlepage
 @title tm Manual (English Version)
 @author by MORIOKA Tomohiko
-@code{$Id: tm_en.texi,v 6.3 1995/09/04 00:57:19 morioka Exp $}
+@code{$Id: tm_en.texi,v 6.4 1995/09/06 03:51:39 morioka Exp $}
 @end titlepage
 
 
-@node Top, List of modules, (dir), (dir)
+@node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
-@chapter tm
-@cindex tm
-
-The tm package is a set of modules to enjoy MIME on GNU Emacs.  Using tm,
-you can
-
-@itemize
-@item playback or view the MIME messages using mime/viewer-mode
-@item encode and decode the multi-lingual headers using tiny-mime
-@item use the enhanced MIME functions with mh-e, GNUS, RMAIL and VM
-@end itemize
-
-and more.
-
+@ifinfo
+@top tm 6.78 Reference manual
+@end ifinfo
 
 @menu
-* List of modules::
-* Emacs Versions::
+* Introduction::   What is tm?
+* Emacs Versions:: Differences between each emacs variants.
 * Install::
 * Setting::
 * tm-MUA::
@@ -41,14 +30,29 @@ and more.
 @end menu
 
 
-@node List of modules, Emacs Versions, Top, Top
+@node Introduction, Emacs Versions, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter List of modules
+@chapter What is tm?
+@cindex tm
+
+The tm package is a set of modules to enjoy MIME on GNU Emacs.  Using tm,
+you can
+
+@itemize @bullet
+@item playback or view the MIME messages using mime/viewer-mode
+@item encode and decode the multi-lingual headers using tiny-mime
+@item use the enhanced MIME features with mh-e, GNUS, RMAIL and VM
+@end itemize
+
+and more.
+
+
+@section List of modules
 @cindex List of modules
 
 The tm package includes the modules listed below.
 
-@itemize
+@itemize @minus
 @item @strong{tiny-mime:} MIME header encoder/decoder
 @item @strong{tm-view:}   MIME viewer
 @item @strong{tm-def:}    definition module for tm
@@ -71,7 +75,7 @@ The tm package includes the modules listed below.
 @end menu
 
 
-@node Emacs Versions, Install, List of modules, Top
+@node Emacs Versions, Install, Introduction, Top
 @comment  node-name,  next,  previous,  up
 @chapter Considerations for each emacs variants
 @cindex Considerations for each emacs variants
@@ -135,7 +139,7 @@ Please modify Makefile to your environment.
 
 Please specify executable file name of emacs.
 
-@itemize
+@itemize @bullet
 @item NEMACS	= for NEMACS (or NEpoch)
 @item MULE1	= for Mule 1.* (based on Emacs 18.*)
 @item ORIG19	= for Emacs 19.* (FSF original or XEmacs)
@@ -146,7 +150,7 @@ Please specify executable file name of emacs.
 
 Please specify directory to install Emacs Lisp program.
 
-@itemize
+@itemize @bullet
 @item TLDIR18 = for Emacs 18.* (NEMACS, NEpoch or MULE 1)
 @item TLDIR19 = for Emacs 19.* (FSF original, XEmacs or MULE 2)
 @end itemize
@@ -255,7 +259,7 @@ functions of MUA like mh-e, GNUS, and RMAIL etc.
 
 The current version of tm provides the following tm-MUA.
 
-@itemize
+@itemize @minus
 @item @strong{tm-mh-e:}  tm-MUA for mh-e
 @item @strong{tm-gnus:}  tm-MUA for GNUS
 @item @strong{tm-rmail:} tm-MUA for RMAIL
diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi
index 4f8140f..2db6588 100644
--- a/doc/tm_ja.texi
+++ b/doc/tm_ja.texi
@@ -6,21 +6,22 @@
 @titlepage
 @title{tm Manual¡ÊÆüËܸìÈÇ¡Ë}
 @author{¼é²¬ ÃÎɧ Ãø}
-@code{$Id: tm_ja.texi,v 4.0 1995/09/04 00:55:35 morioka Exp $}
+@code{$Id: tm_ja.texi,v 5.0 1995/09/06 04:10:18 morioka Exp $}
 @end titlepage
 
 
-@node Top, Abstract, (dir), (dir)
+@node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
-
 @ifinfo
+@top tm-view 6.78 Reference manual
+
 GNU Emacs ¤Ç MIME ¤ò³Ú¤·¤à¤¿¤á¤Î package ¤Ç¤¢¤ë `tm' ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ
 ¤¹¡£
 @end ifinfo
 
 @menu
-* Abstract:: ³µÍ×
-* Emacs-Versions::
+* Introduction::   ¤Ï¤¸¤á¤Ë
+* Emacs-Versions:: Emacs ¤Î¼ïÎàÊ̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â
 * Install::
 * Setting::
 * tm-MUA::
@@ -32,25 +33,28 @@ GNU Emacs 
 @end menu
 
 
-@node Abstract, Emacs-Versions, Top, Top
+@node Introduction, Emacs-Versions, Top, Top
 @comment  node-name,  next,  previous,  up
-@chapter{tm ¤È¤Ï}
-@cindex{tm ¤È¤Ï}
+@chapter tm ¤È¤Ï
+@cindex tm ¤È¤Ï
 
 tm ¤Ï GNU Emacs ¤Ç MIME ¤ò³Ú¤·¤à¤¿¤á¤Î package ¤Ç¤¹¡£tm ¤ò»È¤¦¤È¡¢
-@itemize
+
+@itemize @bullet
 @item tm-view ¤Ë¤è¤ë MIME message ¤Î±ÜÍ÷¡¦ºÆÀ¸
 @item tiny-mime ¤Ë¤è¤ë¿¸À¸ì header ¤Î encode/decode
 @item mh-e, GNUS, RMAIL, VM ¤Ç¤Î MIME µ¡Ç½¤Î¶¯²½
 @end itemize
+
 ¤È¤¤¤¦¤è¤¦¤Ê¤³¤È¤¬¹Ô¤Ê¤¨¤Þ¤¹¡£
 
 
-@section{Module °ìÍ÷}
+@section Module °ìÍ÷
+@cindex module °ìÍ÷
 
 tm ¤Ï°Ê²¼¤Î module ¤«¤é¤Ê¤ê¤Þ¤¹¡£
 
-@itemize
+@itemize @minus
 @item @strong{tiny-mime:} MIME header encoder/decoder
 @item @strong{tm-view:}   MIME viewer
 @item @strong{tm-def:}    tm ¤Î¤¿¤á¤ÎÄêµÁ module
@@ -73,28 +77,41 @@ tm 
 @end menu
 
 
-@node Emacs-Versions, Install, Abstract, Top
+@node Emacs-Versions, Install, Introduction, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Emacs version Ê̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â}
-@cindex{Emacs version Ê̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â}
+@chapter Emacs ¤Î¼ïÎàÊ̤ε¡Ç½¤ª¤è¤ÓÀ©¸Â
+@cindex emacs variants
+@cindex charset
 
-@section{original GNU Emacs 18}
+@section original GNU Emacs 18 and Epoch
+@cindex Original Emacs 18
+@cindex Epoch
 
 Æ°ºî¤ÏÊݾڤ·¤Þ¤»¤ó¡£¤·¤«¤·¤Ê¤¬¤é¡¢US-ASCII ¤ÎÈϰϤǤÏÆ°ºî¤¹¤ë¤È»×¤ï¤ì
 ¤Þ¤¹¡£
 
-@section{NEmacs, NEpoch}
+
+@section NEmacs, NEpoch
+@cindex Emacs 18
+@cindex NEmacs
+@cindex NEpoch
 
 ISO-2022-JP, US-ASCII ¤¬»È¤¨¤Þ¤¹¡£
 
-@section{original GNU Emacs 19}
+
+@section original GNU Emacs 19
+@cindex Original Emacs 19
 
 US-ASCII ¤ª¤è¤Ó ISO-8859-1 ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
 
 ¤Þ¤¿¡¢X window ¾å¤ÎÆÈΩ¤·¤¿ window ¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¾ì¹ç¡¢tm-rich ¤Ë¤è
 ¤ë multi face ɽ¼¨¤¬¹Ô¤Ê¤¨¤Þ¤¹¡£
 
-@section{Mule}
+
+@section Mule
+@cindex Mule
+@cindex Emacs 18
+@cindex Emacs 19
 
 ISO-2022-JP, US-ASCII, ISO-8859-1..9, ISO-2022-CN, ISO-2022-KR, EUC-KR 
 ¤Ê¤É¤Î¿¤¯¤Î charset ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤Þ¤¿¡¢´Ø¿ô 
@@ -103,7 +120,9 @@ mime/set-charset-and-encoding 
 ¤Þ¤¿¡¢Mule 2.* ¤ò X window ¾å¤ÎÆÈΩ¤·¤¿ window ¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¾ì¹ç¡¢
 tm-rich ¤Ë¤è¤ë multi face ɽ¼¨¤¬¹Ô¤Ê¤¨¤Þ¤¹¡£
 
-@section{XEmacs}
+
+@section XEmacs
+@cindex XEmacs
 
 US-ASCII ¤ª¤è¤Ó ISO-8859-1 ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
 
@@ -114,12 +133,14 @@ US-ASCII 
 
 @node Install, Setting, Emacs-Versions, Top
 @comment  node-name,  next,  previous,  up
-@chapter{Install}
-@cindex{Install}
+@chapter Install
+@cindex install
 
 Install ¤Ï¼¡¤Î¼ê½ç¤Ç¹Ô¤Ê¤¤¤Þ¤¹¡£
 
-@section{tl ¤Î install}
+
+@section tl ¤Î install
+@cindex tl
 
 tm ¤Ï Emacs Lisp library ``tl'' ¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£¤è¤Ã¤Æ¡¢¤Þ¤ººÇ½é¤Ë¡¢
 ¤³¤ì¤ò install ¤·¤Æ²¼¤µ¤¤¡£
@@ -128,48 +149,54 @@ tl 
 ¤ÇŬÀÚ¤Ë install ¤·¤Æ²¼¤µ¤¤¡£
 
 
-@section{Makefile}
+@section Makefile
+@cindex Makefile
 
 Makefile ¤ò¼«Ê¬¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ½ñ¤­´¹¤¨¤Æ²¼¤µ¤¤¡£
 
-@subsection{Emacs ¤Î¼Â¹Ô file ̾¤Î»ØÄê}
+@subsection Emacs ¤Î¼Â¹Ô file ̾¤Î»ØÄê
+@cindex Emacs executable
 
 Emacs ¤Î¼Â¹Ô file ̾¤ò»ØÄꤷ¤Æ²¼¤µ¤¤¡£
 
-@itemize
+@itemize @bullet
 @item NEMACS	= for NEMACS (or NEpoch)
 @item MULE1	= for Mule 1.* (based on Emacs 18.*)
 @item ORIG19	= for Emacs 19.* (FSF original or XEmacs)
 @item MULE2	= for MULE 2.* (based on Emacs 19.*)
 @end itemize
 
-@subsection{load-path ¤Î»ØÄê}
+
+@subsection load-path ¤Î»ØÄê
+@cindex load-path
 
 Emacs Lisp program ¤ò install ¤¹¤ë directory ¤ò»ØÄꤷ¤Æ²¼¤µ¤¤¡£
 
-@itemize
+@itemize @bullet
 @item TLDIR18 = for Emacs 18.* (NEMACS, NEpoch or MULE 1)
 @item TLDIR19 = for Emacs 19.* (FSF original, XEmacs or MULE 2)
 @end itemize
 
 
-@section{³°Éô method}
+@section ³°Éô method
+@cindex external method
 
 methods/ °Ê²¼¤Ë¤¢¤ë method script ¤ò sec:method Àá¤ò»²¾È¤·¤Æ¡¢¼«Ê¬¤Î´Ä
 ¶­¤Ë¹ç¤¦¤è¤¦¤Ë½ñ¤­´¹¤¨¤Æ²¼¤µ¤¤¡£
 
 
-@section{make}
+@section make
 
 `make all' ¤·¤Æ²¼¤µ¤¤¡£
 
 
-@section{install}
+@section install
 
 `make install' ¤·¤Æ²¼¤µ¤¤¡£
 
 
-@section{Emacs Lisp program ¤Î install}
+@section Emacs Lisp program ¤Î install
+@cindex installation for emacs lisp modules
 
 NEmacs ¤â¤·¤¯¤Ï NEpoch ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢`make install-nemacs' ¤ò¼Â¹Ô
 ¤·¤Æ²¼¤µ¤¤¡£
@@ -187,18 +214,20 @@ Mule 2.* 
 
 @node Setting, tm-MUA, Install, Top
 @comment  node-name,  next,  previous,  up
-@chapter{ÀßÄê}
-@cindex{ÀßÄê}
+@chapter ÀßÄê
+@cindex ÀßÄê
 
 ¤³¤Î package ¤Ë¤Ï mime-setup.el ¤È tm-setup.el ¤È¤¤¤¦´Ê°×ÀßÄê file ¤¬
 Éí°¤·¤Æ¤¤¤Þ¤¹¡£mime-setup.el ¤Ç¤Ï encoding ¤â´Þ¤á¤¿ MIME Á´È̤ÎÀßÄê¤ò
 ¹Ô¤Ê¤¤¡¢tm-setup ¤Ç¤Ï tm-MUA ¤Ë´Ø¤¹¤ëÀßÄê¤Î¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
 
-@section{mime-setup}
 
-@example
+@section mime-setup
+@cindex mime-setup
+
+@lisp
 (load "mime-setup")
-@end example
+@end lisp
 ¤È¤¹¤ë¤È MIME ¤Ë´Ø¤¹¤ë³Æ¼ïÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£mime-setup ¤Ï tm-setup ¤ò
 Æɤó¤Ç¤¤¤ë¤Î¤Ç¡¢mime-setup ¤ò»È¤¦¾ì¹ç¡¢tm-setup ¤ò load ¤¹¤ëɬÍפϤ¢¤ê
 ¤Þ¤»¤ó¡£
@@ -208,7 +237,7 @@ message header 
 ¹ç¤Ï .emacs ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¡Ê¾Ü¤·¤¯¤Ï signature.el 
 ¤ÎÀâÌÀ½ñ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡Ë
 
-@example
+@lisp
 (setq signature-file-alist
       '((("Newsgroups" . "jokes")       . "~/.signature-jokes")
         (("Newsgroups" . ("zxr" "nzr")) . "~/.signature-sun")
@@ -216,55 +245,60 @@ message header 
         (("To" . "tea")                 . "~/.signature-jokes")
         (("To" . ("sim" "oku" "takuo")) . "~/.signature-formal")
         ))
-@end example
+@end lisp
 
 mime-setup ¤ò»È¤¦¾ì¹ç¤Ï¡¢mime.el ¤¬É¬ÍפǤ¹¡£¤Þ¤¿¡¢SuperCite ¤ò»È¤¦¾ì
 ¹ç¤Ï¡¢SuperCite ¤âɬÍפǤ¹¡£
 
 
-@section{tm-setup}
+@section tm-setup
+@cindex tm-setup
 
 tm-setup ¤Ï tm-MUA ¤ÎÀßÄê¤Î¤ß¤ò¹Ô¤Ê¤¦ module ¤Ç¤¹¡£mime-setup ¤ò load 
 ¤·¤Æ¤¤¤ë¾ì¹ç¡¢¤³¤ì¤òÍÛ¤Ë load ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤¬¡¢mime-setup ¤ò»È
 ¤¤¤¿¤¯¤Ê¤¤¾ì¹ç¡¢°Ê²¼¤Î¤è¤¦¤Ë¤³¤ì¤ò load ¤·¤Æ²¼¤µ¤¤¡£
 
-@example
+@lisp
 (load "tm-setup")
-@end example
+@end lisp
 
 
-@section{vm}
+@section vm
 
 vm ¤ò»È¤¦¾ì¹ç¤Ï .vm ¤« .emacs ¤Ë
-@example
+@lisp
 (load "tm-vm")
-@end example
+@end lisp
 ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£
 
 
-@section{ÀßÄê file ¤ò»È¤ï¤Ê¤¤¾ì¹ç}
+@section ÀßÄê file ¤ò»È¤ï¤Ê¤¤¾ì¹ç
 
 tm-setup.el ¤ò»²¹Í¤Ë¤·¤Æ²¼¤µ¤¤¡£
 
 
 @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'' ¤È¤¤¤¦¤Î¤Ï¡¢mh-e, GNUS, RMAIL ¤Ê¤É¤Î MUA ¤Î¤¿¤á¤Î MIME µ¡Ç½
 ¶¯²½ module ¤ÎÁí¾Î¤Ç¤¹¡£
 
 ¸½ºß¡¢tm-MUA ¤Ë¤Ï¡¢
-@itemize
+
+@itemize @minus
 @item @strong{tm-mh-e:}  mh-e ÍѤΠtm-MUA
 @item @strong{tm-gnus:}  GNUS ÍѤΠtm-MUA
 @item @strong{tm-rmail:} RMAIL ÍѤΠtm-MUA
 @item @strong{tm-vm:}    VM ÍѤΠtm-MUA
 @end itemize
+
 ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾Ï¤Ç¤Ï¤³¤ì¤é¤Î module ¤Ë´Ø¤·¤ÆÀâÌÀ¤·¤Þ¤¹¡£
 
-@section{Summary mode}
+
+@section Summary mode
+@cindex Summary mode
 
 tm-MUA ¤ò»È¤¦¤È¡¢¸µ¤Î MUA ¤Î Summary mode ¤ËÂФ·¤Æ°Ê²¼¤Îµ¡Ç½¤¬Äɲ䵤ì
 ¤Þ¤¹¡£
@@ -292,9 +326,9 @@ tm-MUA 
 
 @node Bug report, Concept Index, tm-MUA, Top
 @comment  node-name,  next,  previous,  up
-@chapter{bug Êó¹ð¤Î»ÅÊý¤È mailing list ¤Ë¤Ä¤¤¤Æ}
-@cindex{bug Êó¹ð}
-@cindex{mailing list}
+@chapter bug Êó¹ð¤Î»ÅÊý¤È mailing list ¤Ë¤Ä¤¤¤Æ
+@cindex bug Êó¹ð
+@cindex mailing list
 
 tm ¤Î¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é fj.editor.emacs ¤Ë post ¤¹¤ë¤«¡¢tm ML ¤Ë mail ¤ò
 Á÷¤Ã¤Æ²¼¤µ¤¤¡£tm ML ¤Î address ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
@@ -338,7 +372,7 @@ tm ML 
 @printindex fn
 
 
-@node Variable Index, Top, Command Index, Top
+@node Variable Index,  , Command Index, Top
 @unnumbered ÊÑ¿ôº÷°ú
 
 @printindex vr
diff --git a/gnus/Makefile b/gnus/Makefile
index 919a91a..d18ee20 100644
--- a/gnus/Makefile
+++ b/gnus/Makefile
@@ -17,7 +17,7 @@ TMDIR19 = $(HOME)/lib/emacs19/lisp
 
 FILES	= tm/gnus/*.el tm/doc/tm-gnus*.texi
 
-TARFILE = tm-gnus6.20.tar
+TARFILE = tm-gnus6.20.1.tar
 
 
 gnus3:
diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus
index 663d082..0d27d1e 100644
--- a/gnus/mk-tgnus
+++ b/gnus/mk-tgnus
@@ -1,5 +1,7 @@
 ;;; -*-Emacs-Lisp-*-
 
+(require 'emu)
+
 (defun compile-tm-gnus ()
   (require 'gnus)
   (require 'tm-view)
@@ -56,6 +58,9 @@
 (defun install-tm-gnus ()
   (let ((path (car command-line-args-left)))
     (princ (format "%s\n" emacs-version))
+    (if (not (file-exists-p path))
+	(make-directory path t)
+      )
     (if (< (string-to-int emacs-version) 19)
 	(progn
 	  (install-el-files path
diff --git a/mh-e/Makefile b/mh-e/Makefile
index 98463b0..d9639a6 100644
--- a/mh-e/Makefile
+++ b/mh-e/Makefile
@@ -23,7 +23,7 @@ TMDIR19	= $(HOME)/lib/emacs19/lisp
 
 
 FILES	= tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
-TARFILE = tm-mh-e6.24.tar
+TARFILE = tm-mh-e6.24.1.tar
 
 
 elc:
diff --git a/mh-e/mk-tmh b/mh-e/mk-tmh
index 4d2fa1b..822e267 100644
--- a/mh-e/mk-tmh
+++ b/mh-e/mk-tmh
@@ -10,6 +10,7 @@
 		 load-path))
 
 (require 'mh-e)
+(require 'emu)
 
 (setq tm-mh-e-modules
       (append
@@ -70,6 +71,9 @@
 (defun install-tm-mh-e ()
   (let ((path (car command-line-args-left)))
     (princ (format "%s\n" emacs-version))
+    (if (not (file-exists-p path))
+	(make-directory path t)
+      )
     (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/mime-setup.el b/mime-setup.el
index b93a5d6..9a56c80 100644
--- a/mime-setup.el
+++ b/mime-setup.el
@@ -1,71 +1,26 @@
 ;;;
-;;; $Id: mime-setup.el,v 6.1 1995/08/26 20:21:12 morioka Exp $
+;;; mime-setup: setup file to use tm and mime.el.
+;;;
+;;; $Id: mime-setup.el,v 6.2 1995/09/06 10:07:26 morioka Exp $
 ;;;
-
-(provide 'mime-setup)
 
 (require 'tm-setup)
 
 
 ;;; @ variables
 ;;;
+
 (defvar mime-setup-use-sc nil)
+(defvar mime-setup-use-signature t)
+(defvar mime-setup-signature-key "\C-c\C-s")
 
 
 ;;; @ for Edit MIME mode
 ;;;
+
 (autoload 'mime-mode "mime" "Edit MIME message." t)
 (autoload 'mime-convert-buffer "mime" "convert to MIME." t)
 
-(autoload 'mime/encode-message-header "tiny-mime"
-	  "convert message header to MIME style." t)
-
-(autoload 'insert-signature "signature" "Insert signature" t)
-
-(add-hook 'mime-mode-hook
-	  (function
-	   (lambda ()
-	     (define-key (current-local-map)
-	       "\C-c\C-s" (function insert-signature))
-	     )))
-(setq mime-translate-hook (function mime/encode-message-header))
-
-(if (boundp 'MULE)
-    (progn
-      (defun mime-header-charset-chooser-for-mule-no-encode-ISO-2022-JP (begin end)
-	(let ((lclist (find-charset-region begin end)))
-	  (cond ((null lclist) nil)		;US-ASCII requres no encoding.
-		((memq lc-ltn1 lclist)
-		 '("ISO-8859-1" . "Q"))
-		((memq lc-ltn2 lclist)
-		 '("ISO-8859-2" . "Q"))
-		((memq lc-ltn3 lclist)
-		 '("ISO-8859-3" . "Q"))
-		((memq lc-ltn4 lclist)
-		 '("ISO-8859-4" . "Q"))
-		((memq lc-crl lclist)
-		 '("ISO-8859-5" . "Q"))
-		;;((memq lc-arb lclist)
-		;; '("ISO-8859-6" . "Q"))
-		((memq lc-grk lclist)
-		 '("ISO-8859-7" . "Q"))
-		((memq lc-hbw lclist)
-		 '("ISO-8859-8" . "Q"))
-		((memq lc-ltn5 lclist)
-		 '("ISO-8859-9" . "Q"))
-		((memq lc-jp lclist) nil)
-		(t				;Unknown charset.  It must be Mule!
-		 '("ISO-2022-JP-2" . "B"))
-		)))
-      (setq mime-header-charset-chooser
-	    'mime-header-charset-chooser-for-mule-no-encode-ISO-2022-JP)
-      )
-  (progn
-    (defun mime-header-charset-chooser-for-nemacs-no-encode-ISO-2022-JP (begin end))
-    (setq mime-header-charset-chooser
-	  'mime-header-charset-chooser-for-nemacs-no-encode-ISO-2022-JP)
-    ))
-
 (setq mime-content-types
       '(("text"
 	 ;; Charset parameter need not to be specified, since it is
@@ -91,8 +46,8 @@
 	 ("external-body"
 	  ("access-type"
 	   ("anon-ftp"
-	    ("site" "wnoc-fuk.wide.ad.jp" "nic.karrn.ad.jp")
-	    ("directory")
+	    ("site" "ftp.jaist.ac.jp" "wnoc-fuk.wide.ad.jp" "nic.karrn.ad.jp")
+	    ("directory" "/pub/GNU/elisp/mime")
 	    ("name")
 	    ("mode" "binary" "ascii"))
 	   ("ftp"
@@ -133,27 +88,96 @@
 	 ("mpeg")))
       )
 
-(setq mime-file-types
-      '(("\\.rtf$"	"text"	"richtext"	nil	nil)
-	("\\.html$"	"text"	"html"	nil	nil)
-	("\\.ps$"	"application"	"postscript"	nil	"quoted-printable")
-	("\\.gif$"	"image"		"gif"	nil	"base64")
-	("\\.jpg$"	"image"		"jpeg"	nil	"base64")
-	("\\.xwd$"	"image"		"x-xwd"	nil	"base64")
-	("\\.xbm$"	"image"		"x-xbm"	nil	"base64")
-	("\\.PIC$"	"image"		"x-pic"	nil	"base64")
-	("\\.pic$"	"image"		"x-pic"	nil	"base64")
-	("\\.tiff$"	"image"		"tiff"	nil	"base64")
-	("\\.au$"	"audio"		"basic"	nil	"base64")
-	("\\.mpg$"	"video"		"mpeg"	nil	"base64")
-	("\\.el$"	"application"	"octet-stream"	nil	"7bit")
-	("\\.signature"	"text"	"plain"	nil	nil)
-	(".*"	nil		nil	nil	nil))
-      )
+
+;;; @ for signature
+;;;
+
+(if mime-setup-use-signature
+    (progn
+      (autoload 'insert-signature "signature" "Insert signature" t)
+      
+      (add-hook 'mime-mode-hook
+		(function
+		 (lambda ()
+		   (define-key (current-local-map)
+		     mime-setup-signature-key
+		     (function insert-signature))
+		   )))
+      
+      (setq gnus-signature-file nil)
+      ))
+
+
+;;; @ for tiny-mime
+;;;
+
+(autoload 'mime/encode-message-header "tiny-mime"
+  "convert message header to MIME style." t)
+
+(add-hook 'mime-translate-hook (function mime/encode-message-header))
+
+(setq mime-header-charset-chooser
+      (function
+       (lambda (begin end)
+	 )))
+
+
+;;; @ for tm-comp
+;;;
+
+(call-after-loaded
+ 'tm-comp
+ (function
+  (lambda ()
+    (setq mime-transfer-encoders
+	  '(("base64"		"mmencode")
+	    ("quoted-printable"	"mmencode" "-q")
+	    ("7bit"		nil)	;Default
+	    ("8bit"		nil)
+	    ("binary"		nil)
+	    ("x-uue"		"uuencode" "-")
+	    ))
+    
+    (setq mime-file-types
+	  '(("\\.rtf$"
+	     "text"	"richtext"	nil	nil)
+	    ("\\.html$"
+	     "text"	"html"		nil	nil)
+	    ("\\.ps$"
+	     "application" "postscript"	nil	"quoted-printable")
+	    ("\\.gif$"
+	     "image"	"gif"		nil	"base64")
+	    ("\\.jpg$"
+	     "image"	"jpeg"		nil	"base64")
+	    ("\\.xwd$"
+	     "image"	"x-xwd"		nil	"base64")
+	    ("\\.xbm$"
+	     "image"	"x-xbm"		nil	"base64")
+	    ("\\.pic$"
+	     "image"	"x-pic"		nil	"base64")
+	    ("\\.tiff$"
+	     "image"	"tiff"		nil	"base64")
+	    ("\\.au$"
+	     "audio"	"basic"		nil	"base64")
+	    ("\\.mpg$"
+	     "video"	"mpeg"		nil	"base64")
+	    ("\\.el$"
+	     "application" "octet-stream" (("name" . file)
+					   ("type" . "emacs-lisp")) "7bit")
+	    ("\\.tar.gz$"
+	     "application" "octet-stream" (("name" . file)
+					   ("type" . "tar")
+					   ("conversions" . "gzip")) nil)
+	    ("\\.signature"
+	     "text"	"plain"		nil	nil)
+	    (".*"	nil		nil	nil	nil))
+	  )
+    )))
 
 
 ;;; @ about SuperCite
 ;;;
+
 (if mime-setup-use-sc
     (require 'sc-setup)
   )
@@ -161,6 +185,7 @@
 
 ;;; @ for mh-e
 ;;;
+
 (add-hook 'mh-letter-mode-hook
 	  (function
 	   (lambda ()
@@ -173,6 +198,7 @@
 
 ;;; @ for GNUS
 ;;;
+
 (add-hook 'news-reply-mode-hook
 	  (function
 	   (lambda ()
@@ -180,16 +206,17 @@
 	     (set-buffer-modified-p nil)
 	     (mime-mode)
 	     )))
-(setq gnus-signature-file nil)
 
 
 ;;; @ for Mail mode (includes VM mode)
 ;;;
+
 (add-hook 'mail-mode-hook (function mime-mode))
 (add-hook 'mail-setup-hook (function mime/decode-message-header))
 
 ;;; @@ In VM, the following definitions may be requried:
 ;;; 
+
 (if (boundp 'vm-visible-headers)
     (progn
       (setq vm-preview-lines nil)
@@ -201,6 +228,12 @@
 		      "Content-Transfer-Encoding:")))
       ))
 
+
+;;; @ end
+;;;
+
+(provide 'mime-setup)
+
 ;;; Local Variables:
 ;;; mode: emacs-lisp
 ;;; mode: outline-minor
diff --git a/mk-tm b/mk-tm
index ea71099..f4614f3 100644
--- a/mk-tm
+++ b/mk-tm
@@ -126,6 +126,9 @@
 (defun install-tm ()
   (let ((path (car command-line-args-left)))
     (princ (format "%s\n" emacs-version))
+    (if (not (file-exists-p path))
+	(make-directory path t)
+      )
     (apply (function install-el-files) path
 	   (append tm-el-files tm-uncompile-el-files)
 	   )