tm 7.42.

diff --git a/ChangeLog b/ChangeLog
index 99a09b9..4fae24a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Sat Feb  3 17:29:01 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.11 was released.
+       * tm: version 7.42 was released
+
+Fri Feb  2 17:20:00 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el: new implementation about PGP processing for message
+
+       * tm-edit.el (mime-editor/pgp-enclose-buffer): new function
+
+       * tm-edit.el (mime-editor/set-sign):
+       check variable `mime-editor/signing-type'
+
+       * tm-edit.el (mime-editor/set-encrypt):
+       check variable `mime-editor/encrypting-type'
+
+Fri Feb  2 17:04:16 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-play.el (mime-article/decode-content): check beginning/ending
+       of region for VM
+
 Wed Jan 31 17:15:55 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tm-image.el: xbm support in Mule: It requires bitmap package.

diff --git a/Makefile b/Makefile
index 0a6a200..0dc277b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.41.3.tar.gz
+TARFILE = tm7.42.tar.gz
 
 
 18:

diff --git a/tm-edit.el b/tm-edit.el
index fcfbf70..97a4a09 100644 (file)
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -2,13 +2,13 @@
 ;;; tm-edit.el --- Simple MIME Composer for GNU Emacs
 ;;;
 ;;; Copyright (C) 1993 UMEDA Masanobu
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
 ;;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/08/21 renamed from mime.el
-;;; Version: $Revision: 7.41 $
+;;; Version: $Revision: 7.42 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.41 1996/01/18 17:49:17 morioka Exp $")
+  "$Id: tm-edit.el,v 7.42 1996/02/02 17:20:00 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -557,33 +557,28 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defconst mime-editor/menu-title "MIME-Edit")
 
 (defconst mime-editor/menu-list
-  (nconc
-   '((mime-help        "Describe MIME editor mode" mime-editor/help)
-     (file     "Insert File"           mime-editor/insert-file)
-     (external "Insert External"       mime-editor/insert-external)
-     (voice    "Insert Voice"          mime-editor/insert-voice)
-     (message  "Insert Message"        mime-editor/insert-message)
-     (mail     "Insert Mail"           mime-editor/insert-mail)
-     (signature        "Insert Signature"      mime-editor/insert-signature)
-     (text     "Insert Text"           mime-editor/insert-text)
-     (tag      "Insert Tag"            mime-editor/insert-tag)
-     (alternative "Enclose as alternative"
-                 mime-editor/enclose-alternative-region)
-     (parallel "Enclose as parallel"   mime-editor/enclose-parallel-region)
-     (mixed    "Enclose as serial"     mime-editor/enclose-mixed-region)
-     (digest   "Enclose as digest"     mime-editor/enclose-digest-region)
-     (signed   "Enclose as signed"     mime-editor/enclose-signed-region)
-     (encrypted        "Enclose as encrypted"  mime-editor/enclose-encrypted-region)
-     (key      "Insert Public Key"     mime-editor/insert-key)
-     (split     "About split"           mime-editor/set-split)
-     )
-   (if (and (featurep 'mailcrypt)
-           (not (or mime-editor/signing-type mime-editor/encrypting-type)))
-       '((sign    "About sign"       mime-editor/set-sign)
-        (encrypt "About encryption" mime-editor/set-encrypt)
-        ))
-   '((preview  "Preview Message"       mime-editor/preview-message))
-   )
+  '((mime-help "Describe MIME editor mode" mime-editor/help)
+    (file      "Insert File"           mime-editor/insert-file)
+    (external  "Insert External"       mime-editor/insert-external)
+    (voice     "Insert Voice"          mime-editor/insert-voice)
+    (message   "Insert Message"        mime-editor/insert-message)
+    (mail      "Insert Mail"           mime-editor/insert-mail)
+    (signature "Insert Signature"      mime-editor/insert-signature)
+    (text      "Insert Text"           mime-editor/insert-text)
+    (tag       "Insert Tag"            mime-editor/insert-tag)
+    (alternative "Enclose as alternative"
+                mime-editor/enclose-alternative-region)
+    (parallel  "Enclose as parallel"   mime-editor/enclose-parallel-region)
+    (mixed     "Enclose as serial"     mime-editor/enclose-mixed-region)
+    (digest    "Enclose as digest"     mime-editor/enclose-digest-region)
+    (signed    "Enclose as signed"     mime-editor/enclose-signed-region)
+    (encrypted "Enclose as encrypted"  mime-editor/enclose-encrypted-region)
+    (key       "Insert Public Key"     mime-editor/insert-key)
+    (split     "About split"           mime-editor/set-split)
+    (sign      "About sign"            mime-editor/set-sign)
+    (encrypt   "About encryption"      mime-editor/set-encrypt)
+    (preview   "Preview Message"       mime-editor/preview-message)
+    )
   "MIME-edit menubar entry.")
 
 (defun mime-editor/define-menu-for-emacs19 ()
@@ -1448,9 +1443,9 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
   (interactive)
   (if (catch 'mime-editor/error
        (save-excursion
+         (mime-editor/pgp-enclose-buffer)
          (mime/encode-message-header)
          (mime-editor/translate-body)
-         (mime-editor/pgp-processing)
          ))
       (progn
        (undo)
@@ -2264,9 +2259,12 @@ a recording host instead of local host."
     (y-or-n-p "Do you want to sign?")
     ))
   (if arg
-      (progn
-       (setq mime-editor/pgp-processing 'sign)
-       (message "This message will be signed.")
+      (if mime-editor/signing-type
+         (progn
+           (setq mime-editor/pgp-processing 'sign)
+           (message "This message will be signed.")
+           )
+       (message "Please specify signing type.")
        )
     (if (eq mime-editor/pgp-processing 'sign)
        (setq mime-editor/pgp-processing nil)
@@ -2280,9 +2278,12 @@ a recording host instead of local host."
     (y-or-n-p "Do you want to encrypt?")
     ))
   (if arg
-      (progn
-       (setq mime-editor/pgp-processing 'encrypt)
-       (message "This message will be encrypt.")
+      (if mime-editor/encrypting-type
+         (progn
+           (setq mime-editor/pgp-processing 'encrypt)
+           (message "This message will be encrypt.")
+           )
+       (message "Please specify encrypting type.")
        )
     (if (eq mime-editor/pgp-processing 'encrypt)
        (setq mime-editor/pgp-processing nil)
@@ -2293,32 +2294,22 @@ a recording host instead of local host."
 (defvar mime-editor/pgp-processing nil)
 (make-variable-buffer-local 'mime-editor/pgp-processing)
 
-(defun mime-editor/call-mc (command)
-  (let* ((header (rfc822/get-header-string-except
-                 "^Content-Type:" mail-header-separator)))
-    (goto-char (point-min))
-    (if (search-forward mail-header-separator)
-       (replace-match "")
-      )
-    (goto-char (point-min))
-    (insert header)
-    (insert "Content-Type: application/pgp; format=mime\n")
-    (insert mail-header-separator)
-    (insert "\n")
-    (if (null (call-interactively command))
-       (throw 'mime-editor/error 'pgp-error)
-      )
-    ))
-
-(defun mime-editor/pgp-processing ()
-  (let ((command
-        (cdr (assq mime-editor/pgp-processing
-                   '((sign    . mc-sign)
-                     (encrypt . mc-encrypt)
-                     )))))
-    (and command
-        (mime-editor/call-mc command)
-        )))
+(defun mime-editor/pgp-enclose-buffer ()
+  (let ((beg (save-excursion
+              (goto-char (point-min))
+              (if (search-forward (concat "\n" mail-header-separator "\n"))
+                  (match-end 0)
+                )))
+       (end (point-max))
+       )
+    (if beg
+       (cond ((eq mime-editor/pgp-processing 'sign)
+              (mime-editor/enclose-signed-region beg end)
+              )
+             ((eq mime-editor/pgp-processing 'encrypt)
+              (mime-editor/enclose-encrypted-region beg end)
+              ))
+      )))
 
 
 ;;; @ split

diff --git a/tm-play.el b/tm-play.el
index d4e092e..941bbb6 100644 (file)
--- a/tm-play.el
+++ b/tm-play.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/9/26 (separated from tm-view.el)
 ;;; Version:
-;;;    $Id: tm-play.el,v 7.12 1996/01/25 08:29:22 morioka Exp $
+;;;    $Id: tm-play.el,v 7.13 1996/02/02 17:04:16 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -62,6 +62,13 @@
        (params (mime::content-info/parameters cinfo))
        (encoding (mime::content-info/encoding cinfo))
        )
+    ;; Check for VM
+    (if (< beg (point-min))
+       (setq beg (point-min))
+      )
+    (if (< (point-max) end)
+       (setq end (point-max))
+      )
     (if ctype
        (let (method cal ret)
          (setq cal (append (list (cons 'type ctype)