From: morioka Date: Mon, 9 Mar 1998 12:03:40 +0000 (+0000) Subject: tm 7.30. X-Git-Tag: tm7_30~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bd7fea6f690f502e3ba2f627bd0b188d1b64af7c;p=elisp%2Ftm.git tm 7.30. --- diff --git a/Changes-7.30.en b/Changes-7.30.en new file mode 100644 index 0000000..0b9e65f --- /dev/null +++ b/Changes-7.30.en @@ -0,0 +1,69 @@ +Wed Dec 6 12:52:53 1995 Morioka Tomohiko + + * tm: Version 7.30 was released. + * tm/mh-e: Version 7.43 was released. + * tm/gnus: Version 7.21 was released. + * tl: Version 7.03 was released. + + * tm-edit.el: In function `mime-editor/split-and-send', to + `(make-variable-buffer-local 'mail-header-separator)' was changed + to `(make-local-variable 'mail-header-separator)'. + + * tm-play.el: In function `mime-article/decode-caesar', + `(setq buffer-read-only nil)' was inserted before + `(erase-buffer)'. (cf. [tm-ja:1214]) + +Wed Dec 6 09:21:07 1995 Morioka Tomohiko + + * README.eng: + According to Shuhei KOBAYASHI , + added and rewrote about VM. + +Wed Dec 6 08:49:15 1995 Morioka Tomohiko + + * tm-vm.el: + (1) Function `tm-vm/over-to-previous' was renamed to + `tm-vm/over-to-previous-method'. + (2) Function `tm-vm/over-to-next was renamed to + `tm-vm/over-to-next-method'. + +Wed Dec 6 06:55:07 1995 Shuhei KOBAYASHI + + * tm-vm.el: + - Variable `tm-vm/automatic-mime-preview' was changed to user + variable. + + - Names of tm-vm hooks were unified to `tm-vm/xxx-hook' from + `vm-xxx-hook'. + + - New function `tm-vm/over-to-previous' and + `tm-vm/over-to-next': they are over-to-previous-method and + over-to-next-method. They are not only set for vm-mode, but + also vm-virtual-mode. + + - add-hook to `tm-vm/update-record' was fixed to + `tm-vm/bbdb-update-record'. It is typo. + +Wed Dec 6 08:20:02 1995 Morioka Tomohiko + + * tm-eword.el, tm-ew-d.el: comment was modified. + + * README.eng: New section `How to get new version'. + + * tm-view.el, tm-play.el: + (1) buffer local variable `mime/show-mode-old-window-configuration' + was renamed to `mime::article/preview-buffer'. + (2) modified about window configuration. + + * tm-vm.el: + (1) Function `tm-vm/preview-current-message' was modified. + (2) over-to-previous-method and over-to-next-method are modified. + +Wed Dec 6 04:18:23 1995 Shuhei KOBAYASHI + + * tm-nemacs.el: Function `mime/code-convert-region-to-emacs' was + modified to use function `code-convert-region'. (cf. [tm-ja:1204]) + +Wed Dec 5 18:52:52 1995 steve@miranova.com (Steven L. Baur) + + * config.tm: bindir declaration was fixed. diff --git a/Changes-7.30.ja b/Changes-7.30.ja new file mode 100644 index 0000000..0d6fce9 --- /dev/null +++ b/Changes-7.30.ja @@ -0,0 +1,75 @@ +Wed Dec 6 12:52:53 1995 Morioka Tomohiko + + * tm: Version 7.30 was released. + * tm/mh-e: Version 7.43 was released. + * tm/gnus: Version 7.21 was released. + * tl: Version 7.03 was released. + + * tm-edit.el: In function `mime-editor/split-and-send', to + `(make-variable-buffer-local 'mail-header-separator)' was changed + to `(make-local-variable 'mail-header-separator)'. + + * tm-play.el: In function `mime-article/decode-caesar', + `(setq buffer-read-only nil)' was inserted before + `(erase-buffer)'. (cf. [tm-ja:1214]) + +Wed Dec 6 09:21:07 1995 Morioka Tomohiko + + * README.eng: + According to Shuhei KOBAYASHI , + added and rewrote about VM. + +Wed Dec 6 08:49:15 1995 Morioka Tomohiko + + * tm-vm.el: + (1) Function `tm-vm/over-to-previous' was renamed to + `tm-vm/over-to-previous-method'. + (2) Function `tm-vm/over-to-next was renamed to + `tm-vm/over-to-next-method'. + +Wed Dec 6 06:55:07 1995 Shuhei KOBAYASHI + + * tm-vm.el: + - tm-vm/automatic-mime-preview を user variable に。私は + tm-vm/automatic-mime-preview は user variable と思っていたのです + が、"*" がついていないみたいなのでつけてみました。 + ＃VM の場合は user variable でいいんですよね？ + + - VM の hook を代用する tm-vm の hook の名前を + vm-xxx-hook -> tm-vm/xxx-hook で統一。 + BBDB が動いていなかった原因その 1 です。 + + - mime-viewer/over-to-(previous|next)-method-alist に + vm-virtual-mode 用の method も登録。 + vm-mode 用に書いたものを独立した関数にして vm-virtual-mode 用に + も登録しました。 + + - BBDB 対応部分で tm-vm/bbdb-update-record ではなく + tm-vm/update-record が add-hook されていたのを修正。 + BBDB が動いていなかった原因その 2 です。 + + ＃まだ BBDB は ";" や ":" で動作がおかしい気がする... + +Wed Dec 6 08:20:02 1995 Morioka Tomohiko + + * tm-eword.el, tm-ew-d.el: comment was modified. + + * README.eng: New section `How to get new version'. + + * tm-view.el, tm-play.el: + (1) buffer local variable `mime/show-mode-old-window-configuration' + was renamed to `mime::article/preview-buffer'. + (2) modified about window configuration. + + * tm-vm.el: + (1) Function `tm-vm/preview-current-message' was modified. + (2) over-to-previous-method and over-to-next-method are modified. + +Wed Dec 6 04:18:23 1995 Shuhei KOBAYASHI + + * tm-nemacs.el: Function `mime/code-convert-region-to-emacs' was + modified to use function `code-convert-region'. (cf. [tm-ja:1204]) + +Wed Dec 5 18:52:52 1995 steve@miranova.com (Steven L. Baur) + + * config.tm: bindir declaration was fixed. diff --git a/Makefile b/Makefile index dabccc3..c86404b 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,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.29.tar.gz +TARFILE = tm7.30.tar.gz 18: diff --git a/README.eng b/README.eng index 3ff928e..a168c7f 100644 --- a/README.eng +++ b/README.eng @@ -1,20 +1,21 @@ [README for tm (English Version)] by MORIOKA Tomohiko -$Id: README.eng,v 7.2 1995/12/03 23:25:59 morioka Exp $ +and KOBAYASHI Shuhei +$Id: README.eng,v 7.4 1995/12/06 09:21:07 morioka Exp $ 1 What's tm? -Tm is a MIME package for GNU Emacs. Tm has following functions: + tm is a MIME package for GNU Emacs. tm has following functions: - MIME style multilingual header - MIME message viewer (mime/viewer-mode) - MIME message composer (mime/editor-mode) - - MIME extenders for mh-e, GNUS, RMAIL and vm + - MIME extenders for mh-e, GNUS, RMAIL and VM 2 Documents -This package includes following documents. + This package includes following documents. (1) English edition @@ -33,7 +34,7 @@ This package includes following documents. 3 Modules -Tm has following modules: + tm has following modules: - tm-view : MIME viewer - tm-parse.el : MIME message parser @@ -192,14 +193,22 @@ RFC 1522 encoded-word. So it is not necessary to reset Run `make install-19', if you use Emacs 19.*. +* 5.3 VM + + If you use VM, please edit `mk-tm'. + 6 .emacs -Please insert (load "mime-setup") in ~/.emacs. + Please insert (load "mime-setup") in ~/.emacs. 6.1 VM -If you want to use vm, please insert (load "tm-vm") in ~/.vm. + If you use vm, please insert (require 'tm-vm) in ~/.vm. + + tm works well with BBDB: If you use VM, please insert +(require 'tm-vm) *after* (bbdb-insinuate-vm). + 6.2 setting sample for hilit19 @@ -297,7 +306,19 @@ Since the user registration is manually done, please write the mail body in human-recognizable language (^_^). -9 TODO +9 How to get new version + +tm is available from following anonymous ftp site: + + ftp://ftp.jaist.ac.jp/pub/GNU/elisp/mime/ (Japan) + +and its mirrors: + + ftp://ftp.nis.co.jp/pub/gnu/emacs-lisp/tm/ (Japan) + ftp://ftp.nisiq.net/pub/gnu/emacs-lisp/tm/ (US) + + +10 TODO - automatic MIME preview support for another MUA - better XEmacs support (e.g. inline image) diff --git a/config.tm b/config.tm index a49270a..a07bfbf 100644 --- a/config.tm +++ b/config.tm @@ -93,7 +93,7 @@ TM_GNUS_DIR19 = $(TMDIR19) TM_GNUS_DIR19_29 = $(TMDIR19_29) -bindir = $(HOME)/bin +bindir = $(PREFIX)/bin CC = gcc diff --git a/gnus/ChangeLog-7.21.en b/gnus/ChangeLog-7.21.en new file mode 100644 index 0000000..68e6001 --- /dev/null +++ b/gnus/ChangeLog-7.21.en @@ -0,0 +1,7 @@ +Wed Dec 6 07:39:37 1995 Morioka Tomohiko + + * tm/gnus: Version 7.21 was released. + + * tm-sgnus.el: New function `tm-gnus/partial-preview-function'. + + * Makefile: install-* were modified. diff --git a/gnus/Makefile b/gnus/Makefile index a0996be..b0652e7 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 7.2 1995/12/05 07:51:04 morioka Exp morioka $ +# $Id: Makefile,v 7.3 1995/12/06 07:39:37 morioka Exp morioka $ # # Please specify emacs executables: @@ -27,7 +27,7 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.20.1.tar +TARFILE = tm-gnus7.21.tar gnus: @@ -46,13 +46,13 @@ sgnus: $(EMACS) -batch -l mk-tgnus -l s-path -f compile-tm-gnus install-18: - $(EMACS) -batch -l mk-tgnus g3-path -f install-tm-gnus $(TMDIR18) + $(EMACS) -batch -l mk-tgnus -f install-tm-gnus $(TMDIR18) install-19: - $(EMACS) -batch -l mk-tgnus -l g4-path -f install-tm-gnus $(TMDIR19) + $(EMACS) -batch -l mk-tgnus -f install-tm-gnus $(TMDIR19) install-19_29: - $(EMACS) -batch -l mk-tgnus -l g4-path -f install-tm-gnus $(TMDIR19_29) + $(EMACS) -batch -l mk-tgnus -f install-tm-gnus $(TMDIR19_29) clean: -rm *.elc diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index e7c0dc5..55b2cbe 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.20 $ +;;; Version: $Revision: 7.21 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -38,7 +38,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.20 1995/12/04 00:25:21 morioka Exp $") + "$Id: tm-sgnus.el,v 7.21 1995/12/06 07:36:03 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -134,6 +134,10 @@ This variable is set to `gnus-show-mime'.") ;;; @ for tm-partial ;;; +(defun tm-gnus/partial-preview-function () + (tm-gnus/view-message (gnus-summary-article-number)) + ) + (call-after-loaded 'tm-partial (lambda () @@ -145,9 +149,7 @@ This variable is set to `gnus-show-mime'.") )) (set-alist 'tm-partial/preview-article-method-alist 'gnus-original-article-mode - '(lambda () - (tm-gnus/view-message (gnus-summary-article-number)) - )) + 'tm-gnus/partial-preview-function) )) diff --git a/mh-e/ChangeLog-7.43.en b/mh-e/ChangeLog-7.43.en new file mode 100644 index 0000000..c03f785 --- /dev/null +++ b/mh-e/ChangeLog-7.43.en @@ -0,0 +1,12 @@ +Wed Dec 6 12:31:27 1995 Morioka Tomohiko + + * tm/mh-e: Version 7.43 was released. + + * tm-mh-e.el: Variable `tm-mh-e/automatic-mime-preview' and + `tm-mh-e/decode-encoded-word' were changed to user variable. + +Wed Dec 6 07:34:13 1995 Morioka Tomohiko + + * tm-mh-e.el: + New function `tm-mh-e/set-window-configuration': it is set to + `mh-show-hook'. diff --git a/mh-e/Makefile b/mh-e/Makefile index 83baa21..98d4004 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.40.tar +TARFILE = tm-mh-e7.43.tar elc: diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index b81b3b0..25140bc 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.41 $ +;;; Version: $Revision: 7.43 $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -27,6 +27,8 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with This program. If not, write to the Free Software ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tl-str) (require 'tl-misc) @@ -45,7 +47,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.41 1995/12/04 03:45:44 morioka Exp $") + "$Id: tm-mh-e.el,v 7.43 1995/12/06 12:31:27 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) @@ -54,10 +56,10 @@ ;;; (defvar tm-mh-e/automatic-mime-preview t - "If non-nil, show MIME processed message.") + "*If non-nil, show MIME processed message.") (defvar tm-mh-e/decode-encoded-word t - "If non-nil, decode encoded-word when it is not MIME preview mode.") + "*If non-nil, decode encoded-word when it is not MIME preview mode.") (defvar tm-mh-e/forwcomps "forwcomps" "Name of file to be used as a skeleton for forwarding messages. @@ -65,6 +67,7 @@ Default is \"forwcomps\". If not a complete path name, the file is searched for first in the user's MH directory, then in the system MH lib directory.") + ;;; @ functions ;;; @@ -264,6 +267,15 @@ With arg, turn MIME processing on if arg is positive." (mh-show (mh-get-msg-num t)) )) +(defun tm-mh-e/set-window-configuration () + (save-excursion + (set-buffer mh-show-buffer) + (setq mime::preview/original-window-configuration + (current-window-configuration)) + )) + +(add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration) + ;;; @ for tm-partial ;;; diff --git a/tm-edit.el b/tm-edit.el index 93743a5..1b3fe4c 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -7,6 +7,7 @@ ;; Author: UMEDA Masanobu ;; MORIOKA Tomohiko +;; Version: $Revision: 7.30 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is not part of GNU Emacs. @@ -107,7 +108,7 @@ ;; LCD Archive Entry: ;; mime|Masanobu UMEDA|umerin@mse.kyutech.ac.jp| ;; Simple MIME Composer| -;; $Date: 1995/12/05 07:58:52 $|$Revision: 7.29 $|~/misc/mime.el.Z| +;; $Date: 1995/12/06 12:52:53 $|$Revision: 7.30 $|~/misc/mime.el.Z| ;;; Code: @@ -125,7 +126,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.29 1995/12/05 07:58:52 morioka Exp $") + "$Id: tm-edit.el,v 7.30 1995/12/06 12:52:53 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -321,9 +322,11 @@ Each elements are regexp of field-name. [tm-edit.el]") ;;; @@ about message splitting ;;; -(defvar mime-editor/split-message t) +(defvar mime-editor/split-message t + "*Split large message if it is non-nil. [tm-edit.el]") -(defvar mime-editor/message-default-max-length 1000) +(defvar mime-editor/message-default-max-length 1000 + "*Default maximum size of a message. [tm-edit.el]") (defvar mime-editor/message-max-length-alist '((news-reply-mode . 500))) @@ -2031,7 +2034,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (setq buf (get-buffer-create "*tmp-send*")) ) (switch-to-buffer buf) - (make-variable-buffer-local 'mail-header-separator) + (make-local-variable 'mail-header-separator) (setq mail-header-separator separator) (switch-to-buffer the-buf) (goto-char (point-min)) diff --git a/tm-ew-d.el b/tm-ew-d.el index 6797b9c..8d6150f 100644 --- a/tm-ew-d.el +++ b/tm-ew-d.el @@ -8,8 +8,28 @@ ;;; ;;; Author: ENAMI Tsugutomo ;;; MORIOKA Tomohiko +;;; Maintainer: MORIOKA Tomohiko +;;; Created: 1993/6/3 (1995/10/3 obsolete tiny-mime.el) +;;; Version: $Revision: 7.6 $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; +;;; This file is part of tm (Tools for MIME). +;;; +;;; This program is free software; you can redistribute it and/or +;;; modify it under the terms of the GNU General Public License as +;;; published by the Free Software Foundation; either version 2, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with This program. If not, write to the Free Software +;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'emu) (require 'tl-822) @@ -21,7 +41,7 @@ ;;; (defconst tm-ew-d/RCS-ID - "$Id: tm-ew-d.el,v 7.5 1995/10/18 11:18:03 morioka Exp $") + "$Id: tm-ew-d.el,v 7.6 1995/12/06 08:15:51 morioka Exp $") (defconst mime/eword-decoder-version (get-version-string tm-ew-d/RCS-ID)) diff --git a/tm-eword.el b/tm-eword.el index 59f2875..96728b9 100644 --- a/tm-eword.el +++ b/tm-eword.el @@ -6,10 +6,31 @@ ;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko +;;; Maintainer: MORIOKA Tomohiko +;;; Created: 1993/6/3 (1995/10/3 obsolete tiny-mime.el) ;;; Version: -;;; $Id: tm-eword.el,v 7.9 1995/10/18 08:55:37 morioka Exp $ +;;; $Id: tm-eword.el,v 7.10 1995/12/06 08:20:02 morioka Exp $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word +;;; Commentary: This module is obsoleted. tm-ew-d.el is part of +;;; tm-view.el, and tm-ew-e.el is part of tm-edit.el. ;;; +;;; This file is part of tm (Tools for MIME). +;;; +;;; This program is free software; you can redistribute it and/or +;;; modify it under the terms of the GNU General Public License as +;;; published by the Free Software Foundation; either version 2, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with This program. If not, write to the Free Software +;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tl-822) (require 'tl-str) diff --git a/tm-nemacs.el b/tm-nemacs.el index 32052c1..b180ce8 100644 --- a/tm-nemacs.el +++ b/tm-nemacs.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-nemacs.el,v 7.1 1995/10/03 04:51:07 morioka Exp $ +;;; $Id: tm-nemacs.el,v 7.2 1995/12/06 08:04:50 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -43,7 +43,7 @@ (defun mime/convert-string-to-emacs (charset str) (cond ((string= "ISO-2022-JP" charset) - (convert-string-kanji-code str *junet* *internal*)) + (code-convert-string str *junet* *internal*)) ((string= "US-ASCII" charset) str) ((string-match "^ISO-8859-[1-9]$" charset) (check-ASCII-string str)) @@ -60,7 +60,7 @@ (progn (setq charset (upcase charset)) (if (string= charset "ISO-2022-JP") - (convert-region-kanji-code beg end *junet* *internal*) + (code-convert-region beg end *junet* *internal*) )))) diff --git a/tm-play.el b/tm-play.el index abd21ce..51fcbcb 100644 --- a/tm-play.el +++ b/tm-play.el @@ -5,12 +5,29 @@ ;;; Copyright (C) 1994,1995 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko +;;; Maintainer: MORIOKA Tomohiko +;;; Created: 1995/9/26 (separated from tm-view.el) ;;; Version: -;;; $Id: tm-play.el,v 7.2 1995/11/16 15:12:43 morioka Exp $ +;;; $Id: tm-play.el,v 7.4 1995/12/06 12:45:52 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). ;;; +;;; This program is free software; you can redistribute it and/or +;;; modify it under the terms of the GNU General Public License as +;;; published by the Free Software Foundation; either version 2, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with This program. If not, write to the Free Software +;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tm-view) @@ -177,11 +194,13 @@ ;;; (defun mime-viewer/quitting-method-for-mime/show-message-mode () - (set-window-configuration mime/show-mode-old-window-configuration) - (let ((mother mime::preview/mother-buffer)) + (let ((mother mime::preview/mother-buffer) + (win-conf mime::preview/original-window-configuration) + ) (kill-buffer (mime::preview-content-info/buffer (car mime::preview/content-list))) (mime-viewer/kill-buffer) + (set-window-configuration win-conf) (pop-to-buffer mother) ;;(goto-char (point-min)) ;;(mime-viewer/up-content) @@ -230,7 +249,11 @@ (total (cdr (assoc "total" cal))) (the-buf (current-buffer)) file - (mother mime::article/preview-buffer)) + (mother mime::article/preview-buffer) + (win-conf (save-excursion + (set-buffer mother) + mime::preview/original-window-configuration)) + ) (if (not (file-exists-p root-dir)) (make-directory root-dir) ) @@ -279,15 +302,26 @@ (goto-char (point-max)) (setq i (1+ i)) ) - (delete-other-windows) - (write-file (concat root-dir "/FULL")) - (setq major-mode 'mime/show-message-mode) + ;;(delete-other-windows) + (let ((buf (current-buffer))) + (write-file (concat root-dir "/FULL")) + (set-window-configuration win-conf) + (let ((win (get-buffer-window mother))) + (if win + (select-window win) + )) + (set-window-buffer (selected-window) buf) + ;;(set-window-buffer buf) + (setq major-mode 'mime/show-message-mode) + ) (mime/viewer-mode mother) (pop-to-buffer (current-buffer)) )) ) (progn - (delete-other-windows) + ;;(delete-other-windows) + (set-window-configuration win-conf) + (select-window (get-buffer-window mother)) (let ((file-coding-system-for-read (if (boundp 'MULE) *noconv*)) kanji-fileio-code) @@ -295,7 +329,7 @@ ) (setq major-mode 'mime/show-message-mode) (mime/viewer-mode mother) - (pop-to-buffer (current-buffer)) + ;;(pop-to-buffer (current-buffer)) )) )) @@ -314,6 +348,7 @@ str) (setq str (buffer-substring beg end)) (switch-to-buffer new-name) + (setq buffer-read-only nil) (erase-buffer) (insert str) (goto-char (point-min)) diff --git a/tm-view.el b/tm-view.el index 309b547..4166989 100644 --- a/tm-view.el +++ b/tm-view.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.29 $ +;;; Version: $Revision: 7.30 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.29 1995/12/05 08:05:18 morioka Exp $") + "$Id: tm-view.el,v 7.30 1995/12/06 07:38:01 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -270,7 +270,7 @@ Each elements are regexp of field-name. [tm-view.el]") ;;; @@ buffer local variables ;;; -(defvar mime/show-mode-old-window-configuration nil) +(defvar mime::preview/original-window-configuration nil) (defvar mime::preview/mother-buffer nil) (defvar mime::article/content-info nil) @@ -734,15 +734,15 @@ listed in key order: (set-buffer buf) (erase-buffer) ))) - (let ((ret (mime-viewer/setup-buffer ctl encoding ibuf obuf))) + (let ((ret (mime-viewer/setup-buffer ctl encoding ibuf obuf)) + (win-conf (current-window-configuration)) + ) (prog1 (switch-to-buffer (car ret)) + (make-variable-buffer-local 'mime::preview/original-window-configuration) + (setq mime::preview/original-window-configuration win-conf) (if mother (progn - (make-variable-buffer-local - 'mime/show-mode-old-window-configuration) - (setq mime/show-mode-old-window-configuration - (current-window-configuration)) (make-variable-buffer-local 'mime::preview/mother-buffer) (setq mime::preview/mother-buffer mother) )) diff --git a/tm-vm.el b/tm-vm.el index 8156b46..66b8fbe 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -11,7 +11,7 @@ ;;; modified by SHIONO Jun'ichi ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.25 $ +;;; Version: $Revision: 7.29 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -36,7 +36,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.25 1995/12/04 23:44:47 morioka Exp $") + "$Id: tm-vm.el,v 7.29 1995/12/06 08:49:15 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -133,7 +133,7 @@ all marked messages are affected, other messages are ignored." ;;; (defvar tm-vm/automatic-mime-preview t - "If non-nil, show MIME processed article.") + "*If non-nil, show MIME processed article.") (defun tm-vm/preview-current-message () ;;; suggested by Simon Rowe @@ -162,7 +162,8 @@ all marked messages are affected, other messages are ignored." (member cte '("7bit" "8bit" "binary")) )))) ) - (let ((win (selected-window))) + (let ((win (selected-window)) buf) + (setq buf (window-buffer win)) (let ((pwin (and mime::article/preview-buffer (get-buffer mime::article/preview-buffer) (get-buffer-window mime::article/preview-buffer)))) @@ -172,19 +173,28 @@ all marked messages are affected, other messages are ignored." )) (vm-display nil nil '(vm-next-message - vm-previous-message - vm-delete-message + vm-previous-message + vm-delete-message vm-undelete-message vm-scroll-forward vm-scroll-backward) (list this-command 'reading-message)) - (vm-select-folder-buffer) - (vm-display (current-buffer) t - '(vm-scroll-forward vm-scroll-backward) - (list this-command 'reading-message)) - (select-window (get-buffer-window (current-buffer))) - (mime/viewer-mode) - (run-hooks 'tm-vm/vm-select-message-hook) - (select-window win) + (setq win (get-buffer-window buf)) + (if win + (select-window win) + ) + (save-window-excursion + (vm-select-folder-buffer) + (setq win (get-buffer-window (current-buffer))) + ;; (vm-display (current-buffer) t + ;; '(vm-scroll-forward vm-scroll-backward) + ;; (list this-command 'reading-message)) + ;; (select-window (get-buffer-window (current-buffer))) + (mime/viewer-mode) + (setq buf (current-buffer)) + (run-hooks 'tm-vm/select-message-hook) + ) + (set-window-buffer win buf) + ;;(select-window win) ) ;; fixed by Oscar Figueiredo ;; 1995/11/17 @@ -194,7 +204,7 @@ all marked messages are affected, other messages are ignored." (if tm-vm/automatic-mime-preview (let (buffer-read-only) (mime/decode-message-header) - (run-hooks 'tm-vm/vm-select-message-hook) + (run-hooks 'tm-vm/select-message-hook) )) )) @@ -308,25 +318,47 @@ all marked messages are affected, other messages are ignored." (select-window summary-win))) ))) -(set-alist 'mime-viewer/over-to-previous-method-alist - 'vm-mode - (function - (lambda () - (set-buffer mime::preview/article-buffer) - (setq this-command 'vm-previous-message) - (vm-previous-message 1 nil t) - (tm-vm/view-message) - ))) +(defun tm-vm/over-to-previous-method () + (set-buffer mime::preview/article-buffer) + (setq this-command 'vm-previous-message) + (let (buf) + (save-window-excursion + (vm-previous-message 1 nil t) + (setq buf + (if (and mime::article/preview-buffer + (get-buffer mime::article/preview-buffer)) + mime::article/preview-buffer + (current-buffer) + )) + ) + (set-window-buffer (selected-window) buf) + )) +(defun tm-vm/over-to-next-method () + (set-buffer mime::preview/article-buffer) + (setq this-command 'vm-next-message) + (let (buf) + (save-window-excursion + (vm-next-message 1 nil t) + (setq buf + (if (and mime::article/preview-buffer + (get-buffer mime::article/preview-buffer) + ) + mime::article/preview-buffer + (current-buffer) + )) + ) + (set-window-buffer (selected-window) buf) + )) + +(set-alist 'mime-viewer/over-to-previous-method-alist + 'vm-mode 'tm-vm/over-to-previous-method) +(set-alist 'mime-viewer/over-to-next-method-alist + 'vm-mode 'tm-vm/over-to-next-method) +(set-alist 'mime-viewer/over-to-previous-method-alist + 'vm-virtual-mode 'tm-vm/over-to-previous-method) (set-alist 'mime-viewer/over-to-next-method-alist - 'vm-mode - (function - (lambda () - (set-buffer mime::preview/article-buffer) - (setq this-command 'vm-next-message) - (vm-next-message 1 nil t) - (tm-vm/view-message) - ))) + 'vm-virtual-mode 'tm-vm/over-to-next-method) ;; 1995/11/16 by Oscar Figueiredo (defun tm-vm/expunge-folder () @@ -537,7 +569,7 @@ Subject: header manually." (concat "^" (regexp-quote mail-header-separator) "\n") nil 0) (tm-vm/enclose-messages vm-forward-list) (mail-position-on-field "To")) - ;; (run-hooks 'tm-vm/forward-message-hook) ; Is it necessary? + (run-hooks 'tm-vm/forward-message-hook) (run-hooks 'vm-mail-mode-hook))))) (defun tm-vm/send-digest (&optional prefix) @@ -591,7 +623,7 @@ only marked messages will be put into the digest." (setq mp (cdr mp))))) (mail-position-on-field "To") (message "Building %s digest... done" vm-digest-send-type))) - ;; (run-hooks 'tm-vm/send-digest-hook) ; Is it necessary? + (run-hooks 'tm-vm/send-digest-hook) (run-hooks 'vm-mail-mode-hook))) @@ -661,7 +693,7 @@ only marked messages will be put into the digest." )) (remove-hook 'vm-select-message-hook 'bbdb/vm-update-record) (remove-hook 'vm-show-message-hook 'bbdb/vm-update-record) - (add-hook 'tm-vm/select-message-hook 'tm-vm/update-record) + (add-hook 'tm-vm/select-message-hook 'tm-vm/bbdb-update-record) )))