From 5f4afd1b17dfaa9570055611a581ef0c27b961c0 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 15:26:49 +0000 Subject: [PATCH] tm 7.43. --- ChangeLog | 17 +++++++++++ Makefile | 2 +- gnus/ChangeLog | 15 +++++++++ gnus/Makefile | 2 +- gnus/tm-sgnus.el | 12 +++++--- tm-edit.el | 89 ++++++++++++++++++++++++++++++++---------------------- tm-vm.el | 28 ++++++++++------- 7 files changed, 112 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index c134d06..2d292d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Fri Feb 9 06:57:20 1996 Morioka Tomohiko + + * tm: Version 7.43 was released. + * tm/gnus: Version 7.43 was released. + + * tm-edit.el: (mime-editor/encrypt-pgp-elkins): + (1) insert ``From'', ``To'' and ``Cc'' fields into encrypted + message. + (2) call `mc-pgp-encrypt-region' directory; it is enclosed by + `(let ((mc-pgp-always-sign 'never)) ...)'. + +Fri Feb 8 08:24:18 1996 SHIONO Jun'ichi + + * tm-vm.el (tm-vm/beginning-of-message, tm-vm/end-of-message): + set to `this-command' (cf. [tm-en:311]) + + Thu Feb 8 06:36:25 1996 Morioka Tomohiko * tm: Version 7.42.1 was released. diff --git a/Makefile b/Makefile index afca0af..2da3968 100644 --- 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.42.1.tar.gz +TARFILE = tm7.43.tar.gz 18: diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 2cf6d8a..a0911f7 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,18 @@ +Fri Feb 9 08:47:07 1996 Morioka Tomohiko + + * tm/gnus: Version 7.43 was released. + +Fri Feb 9 07:48:32 1996 Shuhei KOBAYASHI + + * tm-sgnus.el (tm-gnus/decode-summary-from-and-subjects): + convert character code of ``from'' (cf. [tm-ja:1568]) + +Fri Feb 9 06:19:26 1996 Morioka Tomohiko + + * tm-sgnus.el: Function `tm-gnus/prepare-save-mail-function' is + inserted to `nnmbox-prepare-save-mail-hook' if Mule is running. + + Thu Feb 8 06:17:16 1996 Morioka Tomohiko * tm/gnus: Version 7.41 was released. diff --git a/gnus/Makefile b/gnus/Makefile index f47b352..998609a 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -28,7 +28,7 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.41.tar +TARFILE = tm-gnus7.43.tar gnus: diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index a9c4968..c9b73ee 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.41 $ +;;; Version: $Revision: 7.43 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.41 1996/02/08 06:17:16 morioka Exp $") + "$Id: tm-sgnus.el,v 7.43 1996/02/09 08:13:33 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -230,7 +230,9 @@ This variable is set to `gnus-show-mime'.") ) (add-hook 'nnfolder-prepare-save-mail-hook 'tm-gnus/prepare-save-mail-function) - + (add-hook 'nnmbox-prepare-save-mail-hook + 'tm-gnus/prepare-save-mail-function) + (defun tm-gnus/nnheader-find-file-noselect (&rest args) (let ((file-coding-system-for-read *noconv*)) (apply (function find-file-noselect) args) @@ -257,7 +259,9 @@ This variable is set to `gnus-show-mime'.") (mail-header-set-from header (if from - (mime-eword/decode-string from) + (mime-eword/decode-string + (code-convert-string + from mime/default-coding-system *internal*)) "")) (mail-header-set-subject header diff --git a/tm-edit.el b/tm-edit.el index 97a4a09..2a15e49 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -8,7 +8,7 @@ ;;; MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/08/21 renamed from mime.el -;;; Version: $Revision: 7.42 $ +;;; Version: $Revision: 7.43 $ ;;; 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.42 1996/02/02 17:20:00 morioka Exp $") + "$Id: tm-edit.el,v 7.43 1996/02/09 06:57:20 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1676,39 +1676,57 @@ Content-Transfer-Encoding: 7bit ) )))) +(autoload 'mc-pgp-encrypt-region "mc-pgp") + (defun mime-editor/encrypt-pgp-elkins (beg end boundary) (save-excursion (save-restriction - (narrow-to-region beg end) - (let* ((ret - (mime-editor/translate-region beg end boundary)) - (ctype (car ret)) - (encoding (nth 1 ret)) - (parts (nth 3 ret)) - (pgp-boundary (concat "pgp-" boundary)) - ) - (goto-char beg) - (insert (format "Content-Type: %s\n" ctype)) - (if encoding - (insert (format "Content-Transfer-Encoding: %s\n" encoding)) - ) - (insert "\n") - (if (null - (progn - (goto-char beg) - (insert "=\n") - (prog1 - (let ((mail-header-separator "=")) - (call-interactively 'mc-encrypt) - ) - (goto-char beg) - (and (search-forward "=\n") - (replace-match "")) - ))) - (throw 'mime-editor/error 'pgp-error) - ) - (goto-char beg) - (insert (format "--[[multipart/encrypted; + (let ((from (rfc822/get-field-body "From")) + (to (rfc822/get-field-body "To")) + (cc (rfc822/get-field-body "cc")) + recipients) + (narrow-to-region beg end) + (let* ((ret + (mime-editor/translate-region beg end boundary)) + (ctype (car ret)) + (encoding (nth 1 ret)) + (parts (nth 3 ret)) + (pgp-boundary (concat "pgp-" boundary)) + ) + (goto-char beg) + (if (and (stringp from) + (not (string-equal from ""))) + (insert (format "From: %s\n" from)) + ) + (if (and (stringp to) + (not (string-equal to ""))) + (progn + (insert (format "To: %s\n" to)) + (setq recipients to) + )) + (if (and (stringp cc) + (not (string-equal cc ""))) + (progn + (insert (format "cc: %s\n" cc)) + (if recipients + (setq recipients (concat recipients "," cc)) + (setq recipients cc) + ))) + (insert (format "Content-Type: %s\n" ctype)) + (if encoding + (insert (format "Content-Transfer-Encoding: %s\n" encoding)) + ) + (insert "\n") + (if (null + (let ((mc-pgp-always-sign 'never)) + (mc-pgp-encrypt-region + (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients) + (point-min) (point-max) from nil) + )) + (throw 'mime-editor/error 'pgp-error) + ) + (goto-char beg) + (insert (format "--[[multipart/encrypted; boundary=\"%s\"; protocol=\"application/pgp-encrypted\"][7bit]] --%s @@ -1719,10 +1737,9 @@ Content-Type: application/octet-stream Content-Transfer-Encoding: 7bit " pgp-boundary pgp-boundary pgp-boundary)) - (goto-char (point-max)) - (insert (format "\n--%s--\n" pgp-boundary)) - )) - )) + (goto-char (point-max)) + (insert (format "\n--%s--\n" pgp-boundary)) + ))))) (defun mime-editor/process-pgp-kazu (type beg end boundary) (save-excursion diff --git a/tm-vm.el b/tm-vm.el index bb6e480..96c6df9 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -1,23 +1,25 @@ ;;; ;;; tm-vm.el --- tm-MUA for VM ;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994 MASUTANI Yasuhiro +;;; Copyright (C) 1995 WAKAMIYA Kenji +;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei ;;; -;;; Author: MASUTANI Yasuhiro -;;; Kenji Wakamiya -;;; MORIOKA Tomohiko -;;; Shuhei KOBAYASHI -;;; Oscar Figueiredo +;;; Author: MASUTANI Yasuhiro +;;; Kenji Wakamiya +;;; MORIOKA Tomohiko +;;; Shuhei KOBAYASHI +;;; Oscar Figueiredo ;;; modified by SHIONO Jun'ichi ;;; and ISHIHARA Akito ;;; Maintainer: Shuhei KOBAYASHI ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.40 $ +;;; Version: $Revision: 7.42 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). ;;; -;;; Plese insert (require 'tm-vm) in your ~/.vm or ~/.emacs file. +;;; Plese insert `(require 'tm-vm)' in your ~/.vm file. ;;; ;;; This program is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU General Public License as @@ -39,7 +41,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.40 1996/01/25 05:14:53 morioka Exp $") + "$Id: tm-vm.el,v 7.42 1996/02/09 00:31:21 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -401,7 +403,9 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") "Moves to the beginning of the current message." (interactive) (if (not (tm-vm/system-state)) - (vm-beginning-of-message) + (progn + (setq this-command 'vm-beginning-of-message) + (vm-beginning-of-message)) (vm-follow-summary-cursor) (vm-select-folder-buffer) (vm-check-for-killed-summary) @@ -429,7 +433,9 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") "Moves to the end of the current message." (interactive) (if (not (tm-vm/system-state)) - (vm-end-of-message) + (progn + (setq this-command 'vm-end-of-message) + (vm-end-of-message)) (vm-follow-summary-cursor) (vm-select-folder-buffer) (vm-check-for-killed-summary) -- 1.7.10.4