From 2aef9407cd2e7d43e08691c70453710f3a468bd9 Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 2 Mar 1998 14:02:24 +0000
Subject: [PATCH] tm 5.21.5

---
 Makefile       |   14 ++++++---
 Makefile.18    |    8 +++--
 Makefile.19    |   45 +++++++++++++++++++++++----
 Makefile.o19   |   95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.eng     |    7 +++--
 doc/tm-eng.tex |   15 +++++++--
 tiny-mime.el   |    7 +++--
 tl-list.el     |   23 +++++++++++++-
 8 files changed, 193 insertions(+), 21 deletions(-)
 create mode 100644 Makefile.o19

diff --git a/Makefile b/Makefile
index ffbfe0f..e8a1247 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@ CC	= gcc
 CFLAGS	= -O
 
 UTILS	= ol2 decode-b
-METHODS	= tm-au tm-file tm-image tm-latex tm-mpeg
 GOMI	= $(UTILS) *.elc
-FILES	= README.eng Makefile Makefile.18 Makefile.19 *.el *.c methods \
-		doc/Makefile doc/*.pln doc/*.ol doc/*.tex doc/*.texi
+FILES	= README.eng Makefile Makefile.18 Makefile.19 Makefile.o19 \
+	*.el *.c methods \
+	doc/Makefile doc/*.pln doc/*.ol doc/*.tex doc/*.texi
 
-TARFILE = tm5.21.4.tar
+TARFILE = tm5.21.5.tar
 
 all:	$(UTILS) $(DVI)
 
@@ -19,6 +19,9 @@ all:	$(UTILS) $(DVI)
 19:
 	make -f Makefile.19
 
+o19:
+	make -f Makefile.o19
+
 
 ol2:	ol2.c
 	$(CC) $(CFLAGS) ol2.c -o ol2
@@ -47,6 +50,9 @@ install-18:
 install-19:
 	make -f Makefile.19 install
 
+install-o19:
+	make -f Makefile.o19 install
+
 
 clean:
 	-rm $(GOMI)
diff --git a/Makefile.18 b/Makefile.18
index 35af116..4ff7261 100644
--- a/Makefile.18
+++ b/Makefile.18
@@ -11,9 +11,11 @@ TMMELC	= ${TMMEL:el=elc}
 TMVEL	= tm-rich.el tm-vm.el
 TMVELC	= ${TMVEL:el=elc}
 
-TLDIR	= $(HOME)/lib/emacs18/lisp
-TMDIR	= $(HOME)/lib/emacs18/lisp/tm
-	
+#TLDIR	= $(HOME)/lib/emacs18/lisp
+#TMDIR	= $(HOME)/lib/emacs18/lisp/tm
+TLDIR	= /usr/local/lib/emacs/local.lisp
+TMDIR	= /usr/local/lib/emacs/local.lisp/tm
+
 
 .SUFFIXES:	.el .elc
 
diff --git a/Makefile.19 b/Makefile.19
index 9b7756e..60ae728 100644
--- a/Makefile.19
+++ b/Makefile.19
@@ -1,6 +1,42 @@
-EMACS	= mule2
-ORIG	= emacs19
-MULE	= mule2
+#
+# $Id: Makefile.19,v 1.1 1994/12/27 02:32:05 morioka Exp $
+#
+
+# Please specify emacs executables:
+#	EMACS = for all kind of Emacs 19 (FSF original, MULE or XEmacs)
+#	ORIG  = for FSF original Emacs 19 or XEmacs
+#	MULE  = for MULE 2
+#
+# If you have only one kind of Emacs 19, please dummy specify, like that:
+#
+# for Emacs 19 only: (If executable name = `emacs19')
+#	EMACS	= emacs19
+#	ORIG	= emacs19
+#	MULE	= emacs19
+#
+# for MULE 2 only: (If executable name = `mule2')
+#	EMACS	= mule2
+#	ORIG	= mule2
+#	MULE	= mule2
+#
+# for XEmacs only: (If executable name = `xemacs')
+#	EMACS	= xemacs
+#	ORIG	= xemacs
+#	MULE	= xemacs
+#
+# for every kind of Emacs:
+	EMACS	= mule2
+	ORIG	= emacs19
+	MULE	= mule2
+
+# Please specfy Emacs Lisp install directory:
+#	TLDIR = for tl modules
+#	TMDIR = for tm modules
+#
+# TLDIR	= $(HOME)/lib/emacs19/lisp
+# TMDIR	= $(HOME)/lib/emacs19/lisp/tm
+TLDIR	= /usr/local/lib/mule/site-lisp
+TMDIR	= /usr/local/lib/mule/site-lisp
 
 TLEL	= tl-header.el tl-str.el
 TLELC	= ${TLEL:el=elc}
@@ -11,9 +47,6 @@ TMMELC	= ${TMMEL:el=elc}
 TMVEL	= tm-rich.el
 TMVELC	= ${TMVEL:el=elc}
 
-TLDIR	= $(HOME)/lib/emacs19/lisp
-TMDIR	= $(HOME)/lib/emacs19/lisp/tm
-
 
 .SUFFIXES:	.el .elc
 
diff --git a/Makefile.o19 b/Makefile.o19
new file mode 100644
index 0000000..5d88eab
--- /dev/null
+++ b/Makefile.o19
@@ -0,0 +1,95 @@
+#
+# $Id$
+#
+# Makefile to byte-compile for FSF original Emacs 19 and XEmacs
+#
+
+# Please specify emacs executable:
+EMACS	= emacs19
+
+# Please specfy Emacs Lisp install directory:
+#	TLDIR = for tl modules
+#	TMDIR = for tm modules
+#
+TLDIR	= $(HOME)/lib/emacs19/lisp
+TMDIR	= $(HOME)/lib/emacs19/lisp/tm
+
+TLEL	= tl-header.el tl-str.el
+TLELC	= ${TLEL:el=elc}
+TMEL	= tm-misc.el
+TMELC	= ${TMEL:el=elc}
+TMMEL	= tm-view.el tm-rmail.el tm-comp.el tm-gnus4.el
+TMMELC	= ${TMMEL:el=elc}
+TMVEL	= tm-rich.el
+TMVELC	= ${TMVEL:el=elc}
+
+
+.SUFFIXES:	.el .elc
+
+.el.elc:
+	$(EMACS) -batch -q . -f batch-byte-compile $<
+
+all:	$(TLELC) tl-orig.elc tl-orig.elc tl-list.elc signature.elc \
+	tiny-mime.elc $(TMELC) tm-orig.elc tm-orig.elc $(TMMELC) \
+	tm-mh-e.elc tm-gnus.elc $(TMVELC)
+
+$(TLELC):	$(TLEL)
+
+tl-orig.elc:	tl-orig.el
+	$(EMACS) -batch -q . -f batch-byte-compile $<
+
+tl-list.elc:	tl-list.el
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el -f batch-byte-compile $<
+
+signature.elc:	signature.el
+	$(EMACS) -batch -q . -l tl-header.el -f batch-byte-compile $<
+
+tiny-mime.elc:	tiny-mime.el
+	$(EMACS) -batch -q . -l tl-header.el -l tl-str.el -f batch-byte-compile $<
+
+$(TMELC):
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el -l tl-orig.el -l tm-orig.el -l tl-header.el -l tiny-mime.el -f batch-byte-compile $<
+
+tm-orig.elc:	tm-orig.el
+	$(EMACS) -batch -q . -l tl-orig.el -f batch-byte-compile $<
+
+$(TMMELC):
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el -l tl-orig.el -l tl-header.el -l tm-orig.el -l tiny-mime.el -l tm-misc.el \
+		-f batch-byte-compile $<
+
+tm-gnus.elc:	tm-gnus.el
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el \
+		-l tl-header.el -l tl-orig.el \
+		-l tm-orig.el -l tiny-mime.el -l tm-misc.el -l gnus \
+		-f batch-byte-compile $<
+
+tm-gnus4.elc:	tm-gnus4.el
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el \
+		-l tl-header.el -l tl-orig.el \
+		-l tm-orig.el -l tiny-mime.el -l tm-misc.el
+		-l gnus -l tm-gnus \
+		-f batch-byte-compile $<
+
+tm-mh-e.elc:	tm-mh-e.el
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el -l tl-header.el -l tl-orig.el -l tm-orig.el -l tiny-mime.el -l tm-misc.el -l mh-e \
+		-f batch-byte-compile $<
+
+$(TMVELC):
+	$(EMACS) -batch -q . -l tl-str.el -l tl-list.el -l tl-header.el -l tl-orig.el -l tm-orig.el -l tiny-mime.el -l tm-misc.el -l tm-view.el \
+		-f batch-byte-compile $<
+
+install:	all tl-install tm-install
+
+tl-install:
+	-chmod +w $(TLDIR)/*.el
+	cp -p tl-*.el signature.el $(TLDIR)
+	mv tl-*.elc signature.elc $(TLDIR)
+
+tm-install:
+	-chmod +w $(TMDIR)/*.el
+	cp -p tiny-mime.el tm-*.el mime-setup.el \
+		gnushook.el sc-setup.el $(TMDIR)
+	mv tiny-mime.elc tm-*.elc $(TMDIR)
+
+clean:
+	-rm *.elc
diff --git a/README.eng b/README.eng
index 1376444..209e15c 100644
--- a/README.eng
+++ b/README.eng
@@ -55,7 +55,8 @@ following Makefiles:
 
 	Makefile :	main Makefile
 	Makefile.18 :	Makefile for Emacs 18 (NEmacs, Mule 1.x)
-	Makefile.19 :	Makefile for Emacs 19 (Mule 2.x, XEmacs)
+	Makefile.19 :	Makefile for Emacs 19 and Mule 2.x
+	Makefile.o19 :	Makefile for original Emacs 19 (XEmacs)
 
 
 4.2 External methods
@@ -77,7 +78,9 @@ following Makefiles:
 
   Run `make install-18', if you use Emacs 18 (NEmacs, Mule 1.x).
 
-  Run `make install-19', if you use Emacs 19 (Mule 2.x, XEmacs).
+  Run `make install-19', if you use Emacs 19 and Mule 2.x.
+
+  Run `make install-o19', if you use Emacs 19 or XEmacs.
 
   Or copy *.el to your emacs lisp directory.
 
diff --git a/doc/tm-eng.tex b/doc/tm-eng.tex
index dde24c8..877fc62 100644
--- a/doc/tm-eng.tex
+++ b/doc/tm-eng.tex
@@ -7,7 +7,7 @@
   {\large translated by \Large Ueno Hiroshi} \\
   {\normalsize $<$jl07715@yamato.ibm.co.jp$>$}
   }
-\date{\verb$Id: tm-eng.tex,v 5.5 1994/10/20 01:44:28 morioka Exp $}
+\date{\verb$Id: tm-eng.tex,v 5.6 1995/01/09 20:35:16 morioka Exp $}
 
 \begin{document}
 
@@ -774,14 +774,23 @@ which are yanked from the referenced article.
 \chapter{Reporting Bugs}
 
 Please report tm bugs you find to fj.editor.emacs or send a mail to
-tm ML, $<$tm@chamonix.jaist.ac.jp$>$.
+tm ML:
+\begin{center}
+  \begin{tabular}{ll}
+    tm@chamonix.jaist.ac.jp     & (Japanese or English) \\
+    tm-eng@chamonix.jaist.ac.jp & (English)
+  \end{tabular}
+\end{center}
 
 Via tm ML, You can report bugs of tm, obtain the latest release of tm
 package, and discuss the future enhancements to tm.  To join tm ML,
 send a mail to
 
 \begin{center}
-  tm-admin@chamonix.jaist.ac.jp
+  \begin{tabular}{ll}
+    tm-admin@chamonix.jaist.ac.jp     & (Japanese or English) \\
+    tm-eng-admin@chamonix.jaist.ac.jp & (English)
+  \end{tabular}
 \end{center}
 
 \noindent Since the user registration is manually done, please write
diff --git a/tiny-mime.el b/tiny-mime.el
index 0255017..2ee7982 100644
--- a/tiny-mime.el
+++ b/tiny-mime.el
@@ -21,7 +21,7 @@
 ;;; @ version
 ;;;
 (defconst mime/RCS-ID
-  "$Id: tiny-mime.el,v 5.7 1994/12/05 09:09:23 morioka Exp $")
+  "$Id: tiny-mime.el,v 5.10 1995/01/09 18:56:42 morioka Exp $")
 
 (defconst mime/tiny-mime-version (get-version-string mime/RCS-ID))
 
@@ -481,7 +481,10 @@
       (setq len (length ssl))
       (setq cell (nth 0 ssl))
       (setq et (car cell))
-      (setq w (cdr cell))
+      ;; string-width crashes when the argument is nil,
+      ;; so replace the argument
+      ;; (original modification by Kenji Rikitake 9-JAN-1995)
+      (setq w (or (cdr cell) ""))
       (if (eq et nil)
 	  (progn
 	    (if (> (+ n (string-width w)) 76)
diff --git a/tl-list.el b/tl-list.el
index 0f9ab91..4c2a538 100644
--- a/tl-list.el
+++ b/tl-list.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: tl-list.el,v 2.2 1994/12/11 08:25:35 morioka Exp $
+;;; $Id: tl-list.el,v 2.5 1994/12/27 01:49:41 morioka Exp $
 ;;;
 
 (provide 'tl-list)
@@ -33,6 +33,27 @@
 	   x))))
 
 
+(defun nth-prev (n ls)
+  "Return elements of LS until N - 1 th. [tl-list.el]"
+  (butlast ls (- (length ls) n))
+  )
+
+(defun except-nth (n ls)
+  "Return elements of LS except N th. [tl-list.el]"
+  (append (nth-prev n ls) (nthcdr (+ 1 n) ls))
+  )
+
+(defun last-element (ls)
+  "Return last element. [tl-list.el]"
+  (car (last ls))
+  )
+
+
+;;; @ set
+;;;
+(fset 'is-member 'member)
+
+
 ;;; @ alist
 ;;;
 
-- 
1.7.10.4