From: morioka <morioka>
Date: Mon, 2 Mar 1998 14:40:35 +0000 (+0000)
Subject: tm 6.19
X-Git-Tag: tm6_19~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e26b5c30945825c04f5a87cc362fc0595795e34;p=elisp%2Ftm.git

tm 6.19
---

diff --git a/Makefile b/Makefile
index 2700535..540df8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 6.0 1995/04/20 13:08:16 morioka Exp morioka $
+# $Id: Makefile,v 6.2 1995/04/28 06:15:37 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -23,8 +23,6 @@
 	TMDIR18 = $(HOME)/lib/emacs18/lisp
 	TMDIR19 = $(HOME)/lib/emacs19/lisp
 
-	TLSRCDIR = ../tl
-
 # Please specify GNUS type (`gnus3' or `gnus4') if you use Emacs 18.*
 	EMACS18_GNUS  = gnus3
 #	EMACS18_GNUS  = gnus4
@@ -34,21 +32,22 @@ CC	= gcc
 CFLAGS	= -O
 
 UTILS	= ol2 decode-b
-GOMI	= $(UTILS) *.elc
-FILES	= tm/README.eng tm/rel-*.ol tm/Makefile tm/Makefile.bc \
+GOMI	= $(UTILS) *.elc .lpath.el
+FILES	= tm/README.eng tm/rel-*.ol \
+	tm/Makefile tm/Makefile.bc tm/make-lpath \
 	tm/*.el tm/*.c tm/methods \
 	tm/doc/Makefile tm/doc/*.pln tm/doc/*.ol tm/doc/*.tex tm/doc/*.texi \
 	tm/gnus/Makefile tm/gnus/Makefile.bc tm/gnus/*.el \
 	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.18.tar
+TARFILE = tm6.19.0.tar
 
+.lpath.el:
+	./make-lpath
 
-nemacs:
-	make -f Makefile.bc all \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		EMACS=$(NEMACS) EMACS_TYPE=nemacs TLSRCDIR=$(TLSRCDIR)
+nemacs:	.lpath.el
+	make -f Makefile.bc all EMACS=$(NEMACS) EMACS_TYPE=nemacs
 	(cd gnus; make nemacs NEMACS=$(NEMACS) EMACS18_GNUS=$(EMACS18_GNUS))
 	(cd mh-e; make nemacs NEMACS=$(NEMACS))
 	
@@ -56,10 +55,8 @@ install-nemacs:	nemacs install-mua-18
 	make -f Makefile.bc install TMDIR=$(TMDIR18) EMACS_TYPE=nemacs
 
 
-mule1:
-	make -f Makefile.bc all \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		EMACS=$(MULE1) EMACS_TYPE=mule TLSRCDIR=$(TLSRCDIR)
+mule1:	.lpath.el
+	make -f Makefile.bc all EMACS=$(MULE1) EMACS_TYPE=mule
 	(cd gnus; make mule1 MULE1=$(MULE1) EMACS18_GNUS=$(EMACS18_GNUS))
 	(cd mh-e; make mule1 MULE1=$(MULE1))
 
@@ -71,9 +68,8 @@ install-mua-18:
 	(cd mh-e; make install-18 TMDIR18=$(TMDIR18))
 
 
-orig19:
-	make -f Makefile.bc all \
-		EMACS=$(ORIG19) EMACS_TYPE=orig TLSRCDIR=$(TLSRCDIR)
+orig19:	.lpath.el
+	make -f Makefile.bc all EMACS=$(ORIG19) EMACS_TYPE=orig
 	(cd gnus; make orig19 ORIG19=$(ORIG19))
 	(cd mh-e; make orig19 ORIG19=$(ORIG19))
 
@@ -81,9 +77,8 @@ install-orig19:	orig19 install-mua-19
 	make -f Makefile.bc install TMDIR=$(TMDIR19) EMACS_TYPE=orig
 
 
-mule2:
-	make -f Makefile.bc all \
-		EMACS=$(MULE2) EMACS_TYPE=mule TLSRCDIR=$(TLSRCDIR)
+mule2:	.lpath.el
+	make -f Makefile.bc all EMACS=$(MULE2) EMACS_TYPE=mule
 	(cd gnus; make mule2 MULE2=$(MULE2))
 	(cd mh-e; make mule2 MULE2=$(MULE2))
 
diff --git a/Makefile.bc b/Makefile.bc
index 39dce42..68d1fac 100644
--- a/Makefile.bc
+++ b/Makefile.bc
@@ -1,83 +1,24 @@
 #
-# $Id: Makefile.bc,v 3.0 1995/04/19 02:22:49 morioka Exp $
+# $Id: Makefile.bc,v 4.0 1995/04/27 21:05:48 morioka Exp $
 #
 
-TMMEL	= tm-view.el tm-rmail.el
-TMMELC	= ${TMMEL:el=elc}
-
 TM_EL	= signature.el \
 	tiny-mime.el tm-misc.el tm-$(EMACS_TYPE).el \
-	$(TMMEL) tm-rich.el \
+	tm-view.el tm-rich.el tm-ftp.el tm-latex.el tm-partial.el \
+	tm-rmail.el \
 	tm-comp.el
 TM_ELC	= ${TM_EL:el=elc}
-ALL_EL	= $(TM_EL) tm-ftp.el tm-latex.el tm-partial.el \
-	tm-vm.el \
-	tm-setup.el mime-setup.el
+ALL_EL	= $(TM_EL) tm-vm.el tm-setup.el mime-setup.el
 
 .SUFFIXES:	.el .elc
 
 .el.elc:
-	$(EMACS) -batch -q . -f batch-byte-compile $<
+	$(EMACS) -batch -l .lpath.el -f batch-byte-compile $<
 
 
 all:	$(TM_ELC)
 
-signature.elc:	signature.el
-	$(EMACS) -batch -q . -l $(TLSRCDIR)/tl-header.el \
-		-f batch-byte-compile $<
-
-tiny-mime.elc:	tiny-mime.el
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-header.el \
-		$(OPT) \
-		-f batch-byte-compile $<
-
-tm-misc.elc:	tm-misc.el
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
-		-l $(TLSRCDIR)/tl-header.el \
-		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-l tm-$(EMACS_TYPE).el -l tiny-mime.el \
-		-f batch-byte-compile $<
-
-tm-$(EMACS_TYPE).elc:	tm-$(EMACS_TYPE).el
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el \
-		-l $(TLSRCDIR)/tl-list.el \
-		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-f batch-byte-compile $<
-
-$(TMMELC):	$(TMMEL)
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
-		-l $(TLSRCDIR)/tl-header.el \
-		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-l tm-$(EMACS_TYPE).el -l tiny-mime.el -l tm-misc.el \
-		-f batch-byte-compile $?
-
-tm-rich.elc:	tm-rich.el
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
-		-l $(TLSRCDIR)/tl-header.el \
-		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-l tm-$(EMACS_TYPE).el -l tiny-mime.el -l tm-misc.el \
-		-l tm-view.el \
-		-f batch-byte-compile $<
- 
-tm-comp.elc:	tm-comp.el
-	$(EMACS) -batch -q . \
-		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
-		-l $(TLSRCDIR)/tl-header.el \
-		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-l tm-$(EMACS_TYPE).el -l tiny-mime.el -l tm-misc.el \
-		-l tm-view.el \
-		-f batch-byte-compile $?
-
+$(TM_ELC):
 
 install:
 	-(cd $(TMDIR); chmod +w $(ALL_EL))
diff --git a/gnus/Makefile b/gnus/Makefile
index f5d83a1..ac6aae7 100644
--- a/gnus/Makefile
+++ b/gnus/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 5.0 1995/04/20 12:53:54 morioka Exp $
+# $Id: Makefile,v 6.0 1995/04/28 05:35:00 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -23,9 +23,6 @@
 	TMDIR18	= $(HOME)/lib/emacs18/lisp
 	TMDIR19	= $(HOME)/lib/emacs19/lisp
 
-	TMSRCDIR = ..
-	TLSRCDIR = ../../tl
-
 	EMACS18_GNUS  = gnus3
 
 	EMACS18_GNUS3 = gnus
@@ -42,32 +39,24 @@ nemacs:		nemacs-$(EMACS18_GNUS)
 nemacs-gnus3:
 	make -f Makefile.bc all \
 		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus3 \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3)
 
 nemacs-gnus4:
 	make -f Makefile.bc all \
 		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus4 \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4)
 
 mule1:		mule1-$(EMACS18_GNUS)
 
 mule1-gnus3:
 	make -f Makefile.bc all \
 		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus3 \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3)
 
 mule1-gnus4:
 	make -f Makefile.bc all \
 		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4)
 
 install-18:
 	-chmod +w $(TMDIR18)/tm-gnus*.el
@@ -78,14 +67,12 @@ install-18:
 orig19:
 	make -f Makefile.bc all \
 		EMACS=$(ORIG19) EMACS_TYPE=orig GNUS_TYPE=gnus4 \
-		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP)
 
 mule2:
 	make -f Makefile.bc all \
 		EMACS=$(MULE2) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
-		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP) \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP)
 
 install-19:
 	-(cd $(TMDIR19); chmod +w tm-gnus.el tm-gnus4.el)
diff --git a/gnus/Makefile.bc b/gnus/Makefile.bc
index f89e115..796a708 100644
--- a/gnus/Makefile.bc
+++ b/gnus/Makefile.bc
@@ -1,19 +1,11 @@
 #
-# $Id: Makefile.bc,v 4.0 1995/04/20 12:31:10 morioka Exp $
+# $Id: Makefile.bc,v 6.0 1995/04/28 05:35:50 morioka Exp $
 #
 
 .SUFFIXES:	.el .elc
 
 .el.elc:
-	$(EMACS) -batch -q . \
-		-l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		$(OPT) \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el \
-		-l $(TMDIR)/tiny-mime.el -l $(TMDIR)/tm-misc.el \
-		-l $(TMDIR)/tm-view.el \
-		-l $(NNTP) -l $(GNUS) \
-		-l tm-$(GNUS_TYPE).el -l tm-gnus.el \
+	$(EMACS) -batch -l ../.lpath.el -l $(NNTP) -l $(GNUS) \
 		-f batch-byte-compile $<
 
 all:	tm-gnus.elc tm-$(GNUS_TYPE).elc
diff --git a/make-lpath b/make-lpath
new file mode 100755
index 0000000..eb482a9
--- /dev/null
+++ b/make-lpath
@@ -0,0 +1,6 @@
+#!/bin/csh -f
+
+echo "(setq load-path" > .lpath.el
+echo "      (nconc '("'"."' >> .lpath.el
+echo '               "'`pwd`'"' >> .lpath.el
+echo '               "'`(cd ../tl; pwd)`'") load-path))' >> .lpath.el
diff --git a/mh-e/Makefile b/mh-e/Makefile
index 2217faa..9ac79c3 100644
--- a/mh-e/Makefile
+++ b/mh-e/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1995/01/10 12:28:01 morioka Exp morioka $
+# $Id: Makefile,v 2.0 1995/04/28 05:28:00 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -21,21 +21,12 @@
 	TMDIR18	= /usr/local/lib/emacs/local.lisp/tm
 	TMDIR19	= /usr/local/lib/mule/site-lisp
 
-	TMSRCDIR = ..
-	TLSRCDIR = ../../tl
-
 
 nemacs:
-	make -f Makefile.bc tm-mh-e.elc \
-		EMACS=$(NEMACS) EMACS_TYPE=nemacs \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+	make -f Makefile.bc tm-mh-e.elc EMACS=$(NEMACS) EMACS_TYPE=nemacs
 
 mule1:
-	make -f Makefile.bc tm-mh-e.elc \
-		EMACS=$(MULE1) EMACS_TYPE=mule \
-		OPT='-l $(TLSRCDIR)/tl-18.el' \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+	make -f Makefile.bc tm-mh-e.elc EMACS=$(MULE1) EMACS_TYPE=mule
 
 install-18:
 	-chmod +w $(TMDIR18)/tm-mh-e*.el
@@ -44,14 +35,10 @@ install-18:
 
 
 orig19:
-	make -f Makefile.bc mh-e4 \
-		EMACS=$(ORIG19) EMACS_TYPE=orig \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+	make -f Makefile.bc mh-e4 EMACS=$(ORIG19) EMACS_TYPE=orig
 
 mule2:
-	make -f Makefile.bc mh-e4 \
-		EMACS=$(MULE2) EMACS_TYPE=mule \
-		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
+	make -f Makefile.bc mh-e4 EMACS=$(MULE2) EMACS_TYPE=mule
 
 install-19:
 	-chmod +w $(TMDIR19)/tm-mh-e*.el
diff --git a/mh-e/Makefile.bc b/mh-e/Makefile.bc
index a0b57d8..fc4e252 100644
--- a/mh-e/Makefile.bc
+++ b/mh-e/Makefile.bc
@@ -1,11 +1,11 @@
 #
-# $Id: Makefile.bc,v 1.1 1995/01/10 12:28:22 morioka Exp morioka $
+# $Id: Makefile.bc,v 2.0 1995/04/28 05:24:44 morioka Exp $
 #
 
 .SUFFIXES:	.el .elc
 
 .el.elc:
-	$(EMACS) -batch -q . -f batch-byte-compile $<
+	$(EMACS) -batch -l ../.lpath.el -f batch-byte-compile $<
 
 
 mh-e3:	tm-mh-e.elc tm-mh-e3.elc
@@ -14,17 +14,5 @@ mh-e4:	tm-mh-e.elc
 
 
 tm-mh-e.elc:	tm-mh-e.el
-	$(EMACS) -batch -q . \
-		$(OPT) -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		-l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-misc.el \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el -l $(TMDIR)/tiny-mime.el \
-		-l $(TMDIR)/tm-misc.el -l mh-e \
-		-f batch-byte-compile $<
 
 tm-mh-e3.elc:	tm-mh-e3.el
-	$(EMACS) -batch -q . -l $(TLDIR)/tl-str.el -l $(TLDIR)/tl-list.el \
-		-l $(TLDIR)/tl-header.el -l $(TLDIR)/tl-$(EMACS_TYPE).el \
-		-l $(TMDIR)/tm-$(EMACS_TYPE).el -l $(TMDIR)/tiny-mime.el \
-		-l $(TMDIR)/tm-misc.el -l mh-e -l tm-mh-e.el \
-		-f batch-byte-compile $<
diff --git a/tm-view.el b/tm-view.el
index 0a484e7..cb5ce0e 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -21,7 +21,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.18 1995/04/23 15:51:19 morioka Exp $")
+  "$Id: tm-view.el,v 6.19 1995/04/28 06:13:27 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -366,12 +366,11 @@
 	    (save-restriction
 	      (narrow-to-region cb ce)
 	      (setq ret (apply (function mime-viewer/parse)
-			       (cond ((string= ctype "multipart/mixed")
-				      '(("text/plain") "7bit")
-				      )
-				     ((string= ctype "multipart/digest")
+			       (cond ((string= ctype "multipart/digest")
 				      '(("message/rfc822") "7bit")
-				      ))
+				      )
+				     (t '(("text/plain") "7bit"))
+				     )
 			       ))
 	      ))
 	  (setq children (nconc children (list ret)))