From: morioka Date: Mon, 9 Mar 1998 11:48:55 +0000 (+0000) Subject: tm 7.27.2. X-Git-Tag: tm7_27_2~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4ddaf890182b41f4561de73d5fe10b535673399d;p=elisp%2Ftm.git tm 7.27.2. --- diff --git a/Makefile b/Makefile index 255e041..3488bc1 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ TL_FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.27.1.tar.gz +TARFILE = tm7.27.2.tar.gz nemacs: diff --git a/mh-e/ChangeLog-7.27-7.30.en b/mh-e/ChangeLog-7.27-7.30.en new file mode 100644 index 0000000..ca8d613 --- /dev/null +++ b/mh-e/ChangeLog-7.27-7.30.en @@ -0,0 +1,27 @@ +Sat Nov 25 08:11:36 1995 Morioka Tomohiko + + * tm/mh-e: Version 7.30 was released. + +Fri Nov 24 22:57:59 1995 Morioka Tomohiko + + * tm-mh-e.el: + (1) Function `tm-mh-e/insert-mail' was modified to apply its + argument to function `tm-mh-e/query-message'. + (2) Function `tm-mh-e/query-message' was modified to changed + its argument to `tm-mh-e::message' type. + + * tm-mh-e.el: + Function `tm-mh-e/insert-message' was modified to use function + `tm-mh-e/insert-mail' when mh mail is inserted. (Because of + Mule code conversion) + +Fri Nov 24 21:49:48 1995 Morioka Tomohiko + + * tm-mh-e.el: + (1) Function `tm-mh-e/insert-message' was modified for Gnus. + (2) function `tm-mh-e/query-message' was fixed. + (3) function `tm-mh-e/prompt-for-message' was fixed. + + * tm-mh-e.el: + OKABE Yasuo 's patch was applied. + (cf. [tm-ja:1156]) diff --git a/mh-e/ChangeLog-7.27-7.30.ja b/mh-e/ChangeLog-7.27-7.30.ja new file mode 100644 index 0000000..4c6b5e6 --- /dev/null +++ b/mh-e/ChangeLog-7.27-7.30.ja @@ -0,0 +1,26 @@ +Sat Nov 25 08:11:36 1995 Morioka Tomohiko + + * tm/mh-e: Version 7.30 を release した。 + +Fri Nov 24 22:57:59 1995 Morioka Tomohiko + + * tm-mh-e.el: + (1) 関数 tm-mh-e/insert-mail の引数を関数 tm-mh-e/query-message に + 渡すようにした。 + (2) 関数 tm-mh-e/query-message の引数を tm-mh-e::message 型とした。 + + * tm-mh-e.el: + 関数 tm-mh-e/insert-message で mh の mail の挿入に関数 + tm-mh-e/insert-mail を使うようにした。（挿入した記事を編集中に読め + るようにするため） + +Fri Nov 24 21:49:48 1995 Morioka Tomohiko + + * tm-mh-e.el: + (1) Gnus での使用を考慮して関数 tm-mh-e/insert-message を修正した。 + (2) 関数 tm-mh-e/query-message の不具合を修正した。 + (3) 関数 tm-mh-e/prompt-for-message の不具合を修正した。 + + * tm-mh-e.el: + [tm-ja:1156] での、岡部 寿男 さんの + patch を当てた。 diff --git a/mh-e/Makefile b/mh-e/Makefile index 9359353..a87f088 100644 --- a/mh-e/Makefile +++ b/mh-e/Makefile @@ -23,7 +23,7 @@ TMDIR19 = $(HOME)/lib/emacs19/lisp FILES = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol -TARFILE = tm-mh-e7.26.tar +TARFILE = tm-mh-e7.30.tar elc: diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index e2a528f..5f90095 100644 --- a/mh-e/tm-mh-e.el +++ b/mh-e/tm-mh-e.el @@ -9,7 +9,7 @@ ;;; modified by YAMAOKA Katsumi ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/21 (obsolete mh-e-mime.el) -;;; Version: $Revision: 7.26 $ +;;; Version: $Revision: 7.30 $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.26 1995/11/21 08:55:01 morioka Exp $") + "$Id: tm-mh-e.el,v 7.30 1995/11/24 22:57:59 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) @@ -318,15 +318,16 @@ With arg, turn MIME processing on if arg is positive." (if folder-buf (save-excursion (set-buffer folder-buf) - (let ((show-buffer (get-buffer mh-show-buffer))) - (if show-buffer - (file-name-nondirectory - (buffer-file-name show-buffer)) - )))))) + (let* ((show-buffer (get-buffer mh-show-buffer)) + (show-buffer-file-name + (buffer-file-name show-buffer))) + (if show-buffer-file-name + (file-name-nondirectory show-buffer-file-name))))))) (if (or (null default) (not (string-match "^[0-9]+$" default))) (setq default - (if (string= folder mh-sent-from-folder) + (if (and (string= folder mh-sent-from-folder) + mh-sent-from-msg) (int-to-string mh-sent-from-msg) (car files) ))) @@ -341,11 +342,25 @@ With arg, turn MIME processing on if arg is positive." ) nil nil default) )) -(defun tm-mh-e/query-message () - (let* ((folder (mh-prompt-for-folder - "Message from" (or mh-sent-from-folder "+inbox") nil)) - (number (tm-mh-e/prompt-for-message "Message number: " folder)) - ) +(defun tm-mh-e/query-message (&optional message) + (let (folder number) + (if message + (progn + (setq folder (tm-mh-e::message/folder message)) + (setq number (tm-mh-e::message/number message)) + )) + (or (stringp folder) + (setq folder (mh-prompt-for-folder + "Message from" + (if (and (stringp mh-sent-from-folder) + (string-match "^\\+" mh-sent-from-folder)) + mh-sent-from-folder "+inbox") + nil))) + (setq number + (if (numberp number) + (number-to-string number) + (tm-mh-e/prompt-for-message "Message number: " folder) + )) (tm-mh-e::make-message folder number) )) ;;; end @@ -434,9 +449,38 @@ then prompt for the message sequence. See also documentation for ;;; end (defun tm-mh-e/insert-message (&optional message) - (if (null message) - (setq message (tm-mh-e/query-message)) - ) + ;; always ignore message + (let ((article-buffer + (if (not (and (stringp mh-sent-from-folder) + (numberp mh-sent-from-msg) + )) + (cond ((and (boundp 'gnus-original-article-buffer) + (bufferp mh-sent-from-folder) + (get-buffer gnus-original-article-buffer) + ) + gnus-original-article-buffer) + ((and (boundp 'gnus-article-buffer) + (get-buffer gnus-article-buffer) + (bufferp mh-sent-from-msg) + ) + (save-excursion + (set-buffer gnus-article-buffer) + (if (eq major-mode 'mime/viewer-mode) + mime::preview/article-buffer + (current-buffer) + ))) + )))) + (if (null article-buffer) + (tm-mh-e/insert-mail + (tm-mh-e::make-message mh-sent-from-folder mh-sent-from-msg) + ) + (insert-buffer article-buffer) + (mime-editor/inserted-message-filter) + ) + )) + +(defun tm-mh-e/insert-mail (&optional message) + (setq message (tm-mh-e/query-message message)) (insert-file (tm-mh-e::message/file-name message)) (mime-editor/inserted-message-filter) ) @@ -450,10 +494,10 @@ then prompt for the message sequence. See also documentation for 'mh-letter-mode (function tm-mh-e/insert-message)) (set-alist 'mime-editor/mail-inserter-alist - 'mh-letter-mode (function tm-mh-e/insert-message)) + 'mh-letter-mode (function tm-mh-e/insert-mail)) (set-alist 'mime-editor/mail-inserter-alist - 'news-reply-mode (function tm-mh-e/insert-message)) + 'news-reply-mode (function tm-mh-e/insert-mail)) ))) (call-after-loaded