tm 7.89.

diff --git a/ChangeLog b/ChangeLog
index 8d88009..7f741c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Tue Oct  1 13:36:22 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.61.9 was released.
+       * MU: Version 0.34 was released.
+       * tm: Version 7.89 was released.
+       * tm-mh-e: Version 7.71 was released.
+       * tm-vm: Version 7.66 was released.
+
+       * tm-ew-e.el (tm-eword::phrase-to-rwl): Use function
+       `find-non-ascii-charset-string' instead of `find-charset-string'.
+
+       (mime/encode-message-header): Use function
+       `find-non-ascii-charset-region' instead of `find-charset-region'.
+
+       * tm-edit.el (mime-editor/insert-text): enriched-mode setting.
+
+       (mime-editor/insert-tag): check not to split tag.
+
+       (mime-editor/insert-binary-file): insert text/plain tag if it is
+       need.
+
+Sat Sep 28 10:39:05 1996  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * tm-bbdb.el (tm:mail-extract-address-components): Save original
+       definition of `mail-extract-address-components'.
+
+\f
 Wed Sep 25 02:13:54 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.61.8 was released.

diff --git a/Makefile b/Makefile
index 01a894b..8013ccc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 7.29 1996/09/07 17:20:36 morioka Exp morioka $
 #
 
-VERSION = 7.88
+VERSION = 7.89
 
 SHELL  = /bin/sh
 MAKE   = make

diff --git a/tm-bbdb.el b/tm-bbdb.el
index f9eb188..bb392ee 100644 (file)
--- a/tm-bbdb.el
+++ b/tm-bbdb.el
@@ -6,7 +6,7 @@
 ;; Author: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;         Artur Pioro <artur@flugor.if.uj.edu.pl>
 ;; Maintainer: Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
-;; Version: $Id: tm-bbdb.el,v 7.15 1996/09/02 16:30:37 morioka Exp $
+;; Version: $Id: tm-bbdb.el,v 7.16 1996/09/28 10:39:05 shuhei-k Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB
 
 ;; This file is part of tm (Tools for MIME).
@@ -56,6 +56,8 @@
 (or tm-bbdb/use-mail-extr
     (progn
       (require 'mail-extr) ; for `what-domain'
+      (fset 'tm:mail-extract-address-components
+            (symbol-function 'mail-extract-address-components))
       (fset 'mail-extract-address-components
            (symbol-function 'tm-bbdb/extract-address-components))
       ))

diff --git a/tm-edit.el b/tm-edit.el
index 54cda4e..da7bc8c 100644 (file)
--- 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.88 $
+;; Version: $Revision: 7.89 $
 ;; 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.88 1996/09/24 22:00:21 morioka Exp $")
+  "$Id: tm-edit.el,v 7.89 1996/10/01 13:03:50 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -857,13 +857,22 @@ just return to previous mode."
   "Insert a text message.
 Charset is automatically obtained from the `mime/lc-charset-alist'."
   (interactive)
-  (if (and (mime-editor/insert-tag "text" nil nil)
-          (looking-at mime-editor/single-part-tag-regexp))
+  (let ((ret (mime-editor/insert-tag "text" nil nil)))
+  (if ret
       (progn
-       ;; Make a space between the following message.
-       (insert "\n")
-       (forward-char -1)
-       )))
+       (if (looking-at mime-editor/single-part-tag-regexp)
+           (progn
+             ;; Make a space between the following message.
+             (insert "\n")
+             (forward-char -1)
+             ))
+       (if (and (member (second ret) '("enriched" "richtext"))
+                (fboundp 'enriched-mode)
+                )
+           (enriched-mode t)
+         (if (boundp 'enriched-mode)
+             (enriched-mode nil)
+           ))))))
 
 (defun mime-editor/insert-file (file)
   "Insert a message from a file."
@@ -986,6 +995,15 @@ Charset is automatically obtained from the `mime/lc-charset-alist'."
   "Insert new MIME tag and return a list of PRITYPE, SUBTYPE, and PARAMETERS.
 If nothing is inserted, return nil."
   (interactive)
+  (let ((p (point)))
+    (mime-editor/goto-tag)
+    (if (and (re-search-forward mime-editor/tag-regexp nil t)
+            (< (match-beginning 0) p)
+            (< p (match-end 0))
+            )
+       (goto-char (match-beginning 0))
+      (goto-char p)
+      ))
   (let ((oldtag nil)
        (newtag nil)
        (current (point))
@@ -1050,8 +1068,14 @@ Optional argument ENCODING specifies an encoding method such as base64."
          (progn
            (invisible-region (point-min) (point-max))
            (goto-char (point-max))
-           ))
-      )
+           )
+       (goto-char (point-max))
+       ))
+    (or hide-p
+       (looking-at mime-editor/tag-regexp)
+       (= (point)(point-max))
+       (mime-editor/insert-tag "text" "plain")
+       )
     ;; Define encoding even if it is 7bit.
     (if (stringp encoding)
        (save-excursion
@@ -1972,6 +1996,14 @@ Content-Transfer-Encoding: 7bit
                              (point)))
                       (end (mime-editor/content-end))
                       )
+                  ;; Patch for hard newlines
+                   ;; (save-excursion
+                   ;;   (goto-char beg)
+                   ;;   (while (search-forward "\n" end t)
+                   ;;     (put-text-property (match-beginning 0)
+                   ;;                        (point)
+                   ;;                        'hard t)))
+                  ;; End patch for hard newlines
                   (enriched-encode beg end)
                   (goto-char beg)
                   (if (search-forward "\n\n")

diff --git a/tm-ew-e.el b/tm-ew-e.el
index 255b569..9d4b466 100644 (file)
--- a/tm-ew-e.el
+++ b/tm-ew-e.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 7.54 $
+;; Version: $Revision: 7.55 $
 ;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word
 
 ;; This file is part of tm (Tools for MIME).
@@ -19,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -35,7 +35,7 @@
 ;;;
 
 (defconst tm-ew-e/RCS-ID
-  "$Id: tm-ew-e.el,v 7.54 1996/09/16 08:59:18 morioka Exp $")
+  "$Id: tm-ew-e.el,v 7.55 1996/10/01 13:36:22 morioka Exp $")
 (defconst mime-eword/encoder-version (get-version-string tm-ew-e/RCS-ID))
 
 
@@ -414,7 +414,7 @@ when Subject field is encoded by `mime/encode-message-header'.
                   (append dest
                           (list
                            (let ((ret (tm-eword::find-charset-rule
-                                       (find-charset-string str))))
+                                       (find-non-ascii-charset-string str))))
                              (tm-eword::make-rword
                               str (car ret)(nth 1 ret) 'phrase)
                              )
@@ -552,7 +552,7 @@ when Subject field is encoded by `mime/encode-message-header'.
          (setq beg (match-beginning 0))
          (setq field-name (buffer-substring beg (1- (match-end 0))))
          (setq end (std11-field-end))
-         (and (find-charset-region beg end)
+         (and (find-non-ascii-charset-region beg end)
               (let ((ret (or (ASSOC (downcase field-name)
                                     mime/field-encoding-method-alist
                                     :test (function