From 53ab6c426401d04d0d0ce99d6df144187be6ba01 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:08:14 +0000 Subject: [PATCH] tm 7.67. --- ChangeLog | 14 +++++ Makefile | 2 +- gnus/ChangeLog | 20 ++++++ gnus/Makefile | 2 +- gnus/tm-gnus3.el | 9 ++- gnus/tm-gnus4.el | 14 +++-- gnus/tm-sgnus.el | 18 ++++-- tm-edit.el | 182 ++++++++++++++++++------------------------------------ 8 files changed, 126 insertions(+), 135 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa2a6b3..bbf8656 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Mon Jun 10 01:56:38 1996 MORIOKA Tomohiko + + * tm: Version 7.67 was released. + * tm/gnus: Version 7.69 was released. + +Sun Jun 9 07:03:58 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/split-and-send): New implementation. + + Variable `mime-editor/message-default-sender-alist' was abolished. + + Variable `mime-editor/window-config-alist' was abolished. + + Sun Jun 9 04:13:53 1996 MORIOKA Tomohiko * MEL: Version 5.4 was released. diff --git a/Makefile b/Makefile index 763a346..f5808d9 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.66.2.tar.gz +TARFILE = tm7.67.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/gnus/ChangeLog b/gnus/ChangeLog index abd931f..55adfe4 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,23 @@ +Mon Jun 10 01:56:02 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.69 was released. + +Sun Jun 9 06:57:33 1996 MORIOKA Tomohiko + + * tm-sgnus.el: Set implementation for `message-mode' to + `mime-editor/split-message-sender-alist'. + +Sun Jun 9 06:53:41 1996 MORIOKA Tomohiko + + * tm-gnus4.el: Set `gnus-inews-news' to `news-reply-mode' of + alist `mime-editor/split-message-sender-alist'. + +Sun Jun 9 06:51:09 1996 MORIOKA Tomohiko + + * tm-gnus3.el: Set `gnus-inews-news' to `news-reply-mode' of + alist `mime-editor/split-message-sender-alist'. + + Sun Jun 9 04:12:44 1996 MORIOKA Tomohiko * tm/gnus: Version 7.68 was released. diff --git a/gnus/Makefile b/gnus/Makefile index ba137a4..d69bcc3 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -30,7 +30,7 @@ FILES = tm/gnus/Makefile tm/gnus/*-path tm/gnus/mk-tgnus \ tm/gnus/*.el tm/gnus/ChangeLog tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.68.tar +TARFILE = tm-gnus7.69.tar gnus: diff --git a/gnus/tm-gnus3.el b/gnus/tm-gnus3.el index 34d1067..366b0bc 100644 --- a/gnus/tm-gnus3.el +++ b/gnus/tm-gnus3.el @@ -6,8 +6,9 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko +;;; and KOBAYASHI Shuhei ;;; Created: 1993/11/20 -;;; Version: $Revision: 7.9 $ +;;; Version: $Revision: 7.10 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -46,7 +47,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus3.el,v 7.9 1996/06/06 16:44:17 shuhei-k Exp $") + "$Id: tm-gnus3.el,v 7.10 1996/06/09 06:51:09 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for GNUS 3")) @@ -208,6 +209,10 @@ With arg, turn MIME encoded-word processing on iff arg is positive." (autoload 'tm-mail/insert-message "tm-mail") (set-alist 'mime-editor/message-inserter-alist 'mail-mode (function tm-mail/insert-message)) + + (set-alist 'mime-editor/split-message-sender-alist + 'news-reply-mode + 'gnus-inews-news) ))) diff --git a/gnus/tm-gnus4.el b/gnus/tm-gnus4.el index a4cfce5..3578ac3 100644 --- a/gnus/tm-gnus4.el +++ b/gnus/tm-gnus4.el @@ -7,8 +7,9 @@ ;;; Author: MORIOKA Tomohiko ;;; modified by OKABE Yasuo ;;; Maintainer: MORIOKA Tomohiko +;;; and KOBAYASHI Shuhei ;;; Created: 1993/11/20 (merged tm-gnus5.el) -;;; Version: $Revision: 7.19 $ +;;; Version: $Revision: 7.20 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -37,7 +38,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus4.el,v 7.19 1996/06/06 16:43:42 shuhei-k Exp $") + "$Id: tm-gnus4.el,v 7.20 1996/06/09 06:53:41 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for 3.15 .. 5.1.*")) @@ -170,9 +171,8 @@ This variable is set to `gnus-show-mime'.") 'tm-edit (function (lambda () - (set-alist - 'mime-editor/message-inserter-alist - 'news-reply-mode (function tm-gnus/insert-article)) + (set-alist 'mime-editor/message-inserter-alist + 'news-reply-mode (function tm-gnus/insert-article)) (autoload 'tm-mail/insert-message "tm-mail") (set-alist 'mime-editor/message-inserter-alist @@ -180,6 +180,10 @@ This variable is set to `gnus-show-mime'.") (if (string-match "XEmacs\\|Lucid" emacs-version) (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu) ) + + (set-alist 'mime-editor/split-message-sender-alist + 'news-reply-mode + (function gnus-inews-news)) ))) diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 86f6b6b..3c02ef7 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; and KOBAYASHI Shuhei ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.68 $ +;;; Version: $Revision: 7.69 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -42,7 +42,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.68 1996/06/07 15:28:40 morioka Exp $") + "$Id: tm-sgnus.el,v 7.69 1996/06/09 06:57:33 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -175,12 +175,20 @@ This variable is set to `gnus-show-mime'.") 'tm-edit (function (lambda () - (set-alist - 'mime-editor/message-inserter-alist - 'message-mode (function tm-gnus/insert-article)) + (set-alist 'mime-editor/message-inserter-alist + 'message-mode (function tm-gnus/insert-article)) (if (string-match "XEmacs\\|Lucid" emacs-version) (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu) ) + + (set-alist 'mime-editor/split-message-sender-alist + 'message-mode + (lambda () + (interactive) + (let (message-send-hook + message-sent-message-via) + (message-send) + ))) ))) diff --git a/tm-edit.el b/tm-edit.el index ab57b66..847e8eb 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.66 $ +;;; Version: $Revision: 7.67 $ ;;; 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.66 1996/05/28 03:06:10 morioka Exp $") + "$Id: tm-edit.el,v 7.67 1996/06/09 07:03:58 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -401,12 +401,6 @@ Each elements are regexp of field-name. [tm-edit.el]") (defvar mime-editor/split-blind-field-regexp "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)") -(defvar mime-editor/message-default-sender-alist - '((mail-mode . mail-send-and-exit) - (mh-letter-mode . mh-send-letter) - (news-reply-mode . gnus-inews-news) - )) - (defvar mime-editor/split-message-sender-alist '((mail-mode . (lambda () @@ -436,22 +430,6 @@ Each elements are regexp of field-name. [tm-edit.el]") )) )) -(defvar mime-editor/window-config-alist - '((mail-mode . nil) - (mh-letter-mode . mh-previous-window-config) - (news-reply-mode . (cond ((boundp 'gnus-winconf-post-news) - (prog1 - gnus-winconf-post-news - (setq gnus-winconf-post-news nil) - )) - ((boundp 'gnus-prev-winconf) - (prog1 - gnus-prev-winconf - (setq gnus-prev-winconf nil) - )) - )) - )) - (defvar mime-editor/news-reply-mode-server-running nil) @@ -2322,92 +2300,46 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (make-temp-name (expand-file-name "tm-draft" mime/tmp-dir)))) (separator mail-header-separator) - (config - (eval (cdr (assq major-mode mime-editor/window-config-alist)))) (id (concat "\"" (replace-space-with-underline (current-time-string)) "@" (system-name) "\""))) (run-hooks 'mime-editor/before-split-hook) - (let* ((header (rfc822/get-header-string-except - mime-editor/split-ignored-field-regexp separator)) - (subject (mail-fetch-field "subject")) - (total (+ (/ lines mime-editor/message-max-length) - (if (> (mod lines mime-editor/message-max-length) 0) - 1))) - (the-buf (current-buffer)) - (buf (get-buffer "*tmp-send*")) - (command - (or cmd - (cdr - (assq major-mode - mime-editor/split-message-sender-alist)) - (cdr - (assq major-mode - mime-editor/message-default-sender-alist)) - )) - data) - (goto-char (point-min)) - (if (re-search-forward (concat "^" (regexp-quote separator) "$") - nil t) - (replace-match "") - ) - (if buf - (progn - (switch-to-buffer buf) - (erase-buffer) - (switch-to-buffer the-buf) - ) - (setq buf (get-buffer-create "*tmp-send*")) - ) - (switch-to-buffer buf) - (make-local-variable 'mail-header-separator) - (setq mail-header-separator separator) - (switch-to-buffer the-buf) - (goto-char (point-min)) - (re-search-forward "^$" nil t) - (let ((mime-editor/partial-number 1)) - (setq data (buffer-substring - (point-min) - (progn - (goto-line mime-editor/message-max-length) - (point)) - )) - (delete-region (point-min)(point)) - (switch-to-buffer buf) - (mime-editor/insert-partial-header - header subject id mime-editor/partial-number total separator) - (insert data) - (save-excursion - (save-restriction - (goto-char (point-min)) - (search-forward (concat "\n" mail-header-separator "\n")) - (narrow-to-region - (match-end 0) - (if (re-search-forward "^$" nil t) - (match-beginning 0) - (point-max) + (let ((the-buf (current-buffer)) + (copy-buf (get-buffer-create " *Original Message*")) + (header (rfc822/get-header-string-except + mime-editor/split-ignored-field-regexp separator)) + (subject (mail-fetch-field "subject")) + (total (+ (/ lines mime-editor/message-max-length) + (if (> (mod lines mime-editor/message-max-length) 0) + 1))) + (command + (or cmd + (cdr + (assq major-mode + mime-editor/split-message-sender-alist)) )) - (goto-char (point-min)) - (while (re-search-forward - mime-editor/split-blind-field-regexp nil t) - (delete-region (match-beginning 0) - (let ((e (rfc822/field-end))) - (if (< e (point-max)) - (1+ e) - e))) - ) - )) - (save-excursion - (message (format "Sending %d/%d..." - mime-editor/partial-number total)) - (call-interactively command) - (message (format "Sending %d/%d... done" - mime-editor/partial-number total)) - ) + (mime-editor/partial-number 1) + data) + (save-excursion + (set-buffer copy-buf) (erase-buffer) - (switch-to-buffer the-buf) - (setq mime-editor/partial-number 2) - (while (< mime-editor/partial-number total) + (insert-buffer the-buf) + (save-restriction + (if (re-search-forward + (concat "^" (regexp-quote separator) "$") nil t) + (let ((he (match-beginning 0))) + (replace-match "") + (narrow-to-region (point-min) he) + )) + (goto-char (point-min)) + (while (re-search-forward mime-editor/split-blind-field-regexp nil t) + (delete-region (match-beginning 0) + (1+ (rfc822/field-end))) + ))) + (while (< mime-editor/partial-number total) + (erase-buffer) + (save-excursion + (set-buffer copy-buf) (setq data (buffer-substring (point-min) (progn @@ -2415,28 +2347,36 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (point)) )) (delete-region (point-min)(point)) - (switch-to-buffer buf) - (mime-editor/insert-partial-header - header subject id mime-editor/partial-number total separator) - (insert data) - (save-excursion - (message (format "Sending %d/%d..." - mime-editor/partial-number total)) - (call-interactively command) - (message (format "Sending %d/%d... done" - mime-editor/partial-number total)) - ) - (erase-buffer) - (switch-to-buffer the-buf) - (setq mime-editor/partial-number - (1+ mime-editor/partial-number)) ) - (goto-char (point-min)) (mime-editor/insert-partial-header header subject id mime-editor/partial-number total separator) + (insert data) + (save-excursion + (message (format "Sending %d/%d..." + mime-editor/partial-number total)) + (call-interactively command) + (message (format "Sending %d/%d... done" + mime-editor/partial-number total)) + ) + (setq mime-editor/partial-number + (1+ mime-editor/partial-number)) + ) + (erase-buffer) + (save-excursion + (set-buffer copy-buf) + (setq data (buffer-string)) + (erase-buffer) + ) + (mime-editor/insert-partial-header + header subject id mime-editor/partial-number total separator) + (insert data) + (save-excursion (message (format "Sending %d/%d..." mime-editor/partial-number total)) - )))) + (message (format "Sending %d/%d... done" + mime-editor/partial-number total)) + ) + ))) (defun mime-editor/maybe-split-and-send (&optional cmd) (interactive) -- 1.7.10.4