From 62a72f8afd0b4a1e06ad3df85b58f549fad45b7e Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Tue, 10 Mar 1998 05:48:49 +0000
Subject: [PATCH] tm 7.92.

---
 ChangeLog  |   13 +++++++++++++
 Makefile   |    2 +-
 inst-tm    |   22 ++++++++++++++++++----
 tm-edit.el |    6 +++---
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91d13eb..2f9428b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Oct 24 08:25:47 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* tl: Version 7.61.12 was released.
+	* tm: Version 7.92 was released.
+	* tm-vm: Version 7.68 was released.
+
+	* tm-edit.el (mime-editor::edit-again): Use function
+ 	`std11-unfold-string' instead of `rfc822/unfolding-string'.
+
+Thu Oct 24 08:14:02 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* inst-tm (make-mime-setup): generate relative method dir.
+
 Thu Oct 24 04:43:52 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* tl: Version 7.61.11 was released.
diff --git a/Makefile b/Makefile
index ddcd0ca..cd3cc4a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 7.30 1996/10/16 00:35:29 morioka Exp morioka $
 #
 
-VERSION = 7.91
+VERSION = 7.92
 
 SHELL	= /bin/sh
 MAKE	= make
diff --git a/inst-tm b/inst-tm
index 9c2f796..8268eb9 100644
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.39 1996/09/06 16:18:21 morioka Exp $
+;;; $Id: inst-tm,v 7.40 1996/10/24 08:14:02 morioka Exp $
 ;;;
 
 (defun config-tm ()
@@ -31,7 +31,7 @@
 (defun make-mime-setup (tl-absolute-path tl-path mu-path mel-path tm-path)
   (let ((buf (find-file "mime-setup.el.in")))
     (goto-char (point-min))
-    (re-search-forward "^;;; Code:" nil t)
+    (re-search-forward "^;;; Code:\n" nil t)
     (setq buffer-read-only nil)
 
     ;; generate tl setting
@@ -61,8 +61,22 @@
 	(insert (format "\n(add-path \"%s\")" tm-path)))
     
     ;; generate tm external-methods path setting
-    (insert
-     (format "\n(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR))
+    (or (string= METHOD_DIR exec-directory)
+	(insert
+	 (format "\n(defvar mime-viewer/external-progs %s)"
+		 (let ((dir (file-relative-name METHOD_DIR data-directory)))
+		   (if (< (length dir) (length METHOD_DIR))
+		       (concat "\n  (expand-file-name \""
+			       dir "\" data-directory)")
+		     (setq dir (file-relative-name METHOD_DIR
+						   (expand-file-name "~/")))
+		     (if (< (length dir) (length METHOD_DIR))
+			 (concat "\n  (expand-file-name \"~/"
+				 dir "\")")
+		       (concat "\"" METHOD_DIR "\"")
+		       )))
+		 ))
+	)
     (write-file "mime-setup.el")
     ))
 
diff --git a/tm-edit.el b/tm-edit.el
index aac8c2f..6e9724c 100644
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -6,7 +6,7 @@
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
-;; Version: $Revision: 7.91 $
+;; Version: $Revision: 7.92 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual
 
 ;; This file is part of tm (Tools for MIME).
@@ -121,7 +121,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.91 1996/10/24 04:43:52 morioka Exp $")
+  "$Id: tm-edit.el,v 7.92 1996/10/24 08:25:47 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -2618,7 +2618,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			    (end (std11-field-end)))
 			(setq encoding
 			      (eliminate-top-spaces
-			       (rfc822/unfolding-string
+			       (std11-unfold-string
 				(buffer-substring hbeg end))))
 			(if (or charset (string-equal type "text"))
 			    (progn
-- 
1.7.10.4