From 552d9a759492e03b974bbf0c3e56813925e9b47c Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:58:55 +0000 Subject: [PATCH] tm 7.78. --- ChangeLog | 26 +++++++++++++- Makefile | 2 +- README.en | 15 ++------ gnus/ChangeLog | 17 +++++++++ gnus/gnus-art-mime.el | 52 +++++++++++++-------------- gnus/gnus-charset.el | 52 +++++++++++++-------------- gnus/gnus-mime.el | 51 +++++++++++++-------------- gnus/gnus-msg-mime.el | 54 ++++++++++++++-------------- gnus/gnus-sum-mime.el | 52 +++++++++++++-------------- gnus/message-mime.el | 94 ++++++++++++++++++++++++++++--------------------- mime-setup.el.in | 11 +----- tm-edit.el | 33 +++++------------ tm-vm.el | 84 +++++++++++++++++++++---------------------- 13 files changed, 276 insertions(+), 267 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0ae604..b000291 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,30 @@ +Mon Aug 12 11:02:46 1996 MORIOKA Tomohiko + + * tm: Version 7.78 was released. + * tm/gnus: gnus-mime Version 0.4 was released. + + * README.en: modified about bug report. + +Sun Aug 11 13:57:11 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/encrypt-pgp-kazu): Use function + `mime-editor/make-encrypt-recipient-header'. + +Sat Aug 10 12:04:21 1996 MORIOKA Tomohiko + + * mime-setup.el.in: setting for variable + `message-forward-start-separator' and + `message-forward-end-separator' was moved to message-mime.el. + +Sat Aug 10 02:35:23 1996 John S Cooper + + * tm-vm.el: fixed problem when variable `vm-frame-per-composition' + is nil. (cf. [bug-tm-en:675]) + + Fri Aug 9 12:16:23 1996 MORIOKA Tomohiko - * tm: Version 7.77 + * tm: Version 7.77 was released. * tm/gnus: gnus-mime Version 0.3 was released. * tm-edit.el (mime-editor/encrypt-recipient-fields-list): New diff --git a/Makefile b/Makefile index e0c8c27..ef3768d 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.77.tar.gz +TARFILE = tm7.78.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/README.en b/README.en index b7b30cb..cd474a2 100644 --- a/README.en +++ b/README.en @@ -1,7 +1,7 @@ [README for tm (English Version)] by MORIOKA Tomohiko and KOBAYASHI Shuhei -$Id: README.en,v 7.21 1996/05/27 15:14:29 morioka Exp $ +$Id: README.en,v 7.22 1996/08/12 11:02:46 morioka Exp $ 1 What's tm? @@ -307,18 +307,7 @@ functions: 8 Bug report If you write bug-reports and/or propositions for improvement, please -post them to following news groups: - - fj.editor.emacs (Japanese or English) - fj.editor.mule (Japanese or English; if you use Mule) - gnu.emacs.help (English) - - fj.news.reader.gnus (Japanese or English; about GNUS and Gnus) - gnu.emacs.gnus (English; about GNUS and Gnus) - - gnu.emacs.vm.info (English; about tm-vm) - -or send to tm ML: +send to tm ML: bug-tm-en@chamonix.jaist.ac.jp (English) bug-tm-ja@chamonix.jaist.ac.jp (Japanese) diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 3fbf291..4c0a26b 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,20 @@ +Mon Aug 12 09:11:34 1996 MORIOKA Tomohiko + + * tm/gnus: gnus-mime Version 0.4 was released. + + * message-mime.el (message-included-forward-headers): Add + `Mime-Version' field and `Content-*' field if they are not existed + in. + +Sat Aug 10 12:05:14 1996 MORIOKA Tomohiko + + * message-mime.el: setting for variable + `message-forward-start-separator' and + `message-forward-end-separator' was moved from mime-setup.el.in. + + * message-mime.el: add (require 'tm-edit). + + Fri Aug 9 12:29:10 1996 MORIOKA Tomohiko * tm/gnus: gnus-mime Version 0.3 was released. diff --git a/gnus/gnus-art-mime.el b/gnus/gnus-art-mime.el index cd7ed4c..5d22a5d 100644 --- a/gnus/gnus-art-mime.el +++ b/gnus/gnus-art-mime.el @@ -1,31 +1,29 @@ -;;; ;;; gnus-art-mime.el --- MIME extension for article mode of Gnus -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995,1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/6 -;;; Version: -;;; $Id: gnus-art-mime.el,v 0.3 1996/08/08 15:12:51 morioka Exp $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/6 +;; Version: +;; $Id: gnus-art-mime.el,v 0.4 1996/08/12 09:00:14 morioka Exp $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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) diff --git a/gnus/gnus-charset.el b/gnus/gnus-charset.el index a0e0f01..561adc9 100644 --- a/gnus/gnus-charset.el +++ b/gnus/gnus-charset.el @@ -1,31 +1,29 @@ -;;; ;;; gnus-charset.el --- MIME charset extension for Gnus -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995,1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/6 -;;; Version: -;;; $Id: gnus-charset.el,v 0.1 1996/08/06 12:07:28 morioka Exp $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/6 +;; Version: +;; $Id: gnus-charset.el,v 0.2 1996/08/12 09:06:54 morioka Exp $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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: (defvar running-xemacs (string-match "XEmacs" emacs-version)) diff --git a/gnus/gnus-mime.el b/gnus/gnus-mime.el index 3b47692..66fbf61 100644 --- a/gnus/gnus-mime.el +++ b/gnus/gnus-mime.el @@ -1,29 +1,28 @@ -;;; ;;; gnus-mime.el --- MIME extensions for Gnus -;;; -;;; Copyright (C) 1996 Free Software Foundation, Inc. -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/6 -;;; Version: $Revision: 0.3 $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; + +;; Copyright (C) 1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/6 +;; Version: $Revision: 0.4 $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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: (defun call-after-loaded (module func &optional hook-name) @@ -52,7 +51,7 @@ it is used as hook to set. [gnus-mime.el]" ;;; (defconst gnus-mime-RCS-ID - "$Id: gnus-mime.el,v 0.3 1996/08/07 16:31:12 morioka Exp $") + "$Id: gnus-mime.el,v 0.4 1996/08/12 08:57:33 morioka Exp $") (defconst gnus-mime-version (get-version-string gnus-mime-RCS-ID)) diff --git a/gnus/gnus-msg-mime.el b/gnus/gnus-msg-mime.el index 5959f8a..9818805 100644 --- a/gnus/gnus-msg-mime.el +++ b/gnus/gnus-msg-mime.el @@ -1,31 +1,29 @@ -;;; -;;; gnus-msg-mime.el --- MIME extensions -;;; for mail and post interface of Gnus -;;; -;;; Copyright (C) 1996 Free Software Foundation, Inc. -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/8 -;;; Version: -;;; $Id: gnus-msg-mime.el,v 0.1 1996/08/08 15:49:36 morioka Exp $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; +;;; gnus-msg-mime.el --- MIME extension for mail and post interface of Gnus + +;; Copyright (C) 1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/8 +;; Version: +;; $Id: gnus-msg-mime.el,v 0.2 1996/08/12 09:02:41 morioka Exp $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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 'gnus-msg) diff --git a/gnus/gnus-sum-mime.el b/gnus/gnus-sum-mime.el index bbbe8f3..d8f3f08 100644 --- a/gnus/gnus-sum-mime.el +++ b/gnus/gnus-sum-mime.el @@ -1,31 +1,29 @@ -;;; ;;; gnus-sum-mime.el --- MIME extension for summary mode of Gnus -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995,1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/6 -;;; Version: -;;; $Id: gnus-sum-mime.el,v 0.2 1996/08/09 12:29:10 morioka Exp $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/6 +;; Version: +;; $Id: gnus-sum-mime.el,v 0.3 1996/08/12 09:04:14 morioka Exp $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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 'gnus-mime) diff --git a/gnus/message-mime.el b/gnus/message-mime.el index acbafed..4ca3f42 100644 --- a/gnus/message-mime.el +++ b/gnus/message-mime.el @@ -1,32 +1,49 @@ -;;; ;;; message-mime.el --- MIME extensions for message.el -;;; -;;; Copyright (C) 1996 Free Software Foundation, Inc. -;;; -;;; Author: MORIOKA Tomohiko -;;; Created: 1996/8/6 -;;; Version: -;;; $Id: message-mime.el,v 0.2 1996/08/07 16:33:30 morioka Exp $ -;;; Keywords: news, MIME, multimedia, multilingual, encoded-word -;;; -;;; This file is not part of GNU Emacs yet. -;;; -;;; 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. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1996/8/6 +;; Version: +;; $Id: message-mime.el,v 0.5 1996/08/12 09:11:34 morioka Exp $ +;; Keywords: news, MIME, multimedia, multilingual, encoded-word + +;; This file is not part of GNU Emacs yet. + +;; 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-edit) + +(setq message-forward-start-separator + (concat (mime-make-tag "message" "rfc822") "\n")) + +(setq message-forward-end-separator "") + +(or (string-match message-included-forward-headers "Mime-Version:") + (setq message-included-forward-headers + (concat message-included-forward-headers "\\|^Mime-Version:")) + ) + +(or (string-match message-included-forward-headers "Content-Type:") + (setq message-included-forward-headers + (concat message-included-forward-headers "\\|^Content-Type:")) + ) + + ;;; @ for tm-edit ;;; @@ -40,21 +57,16 @@ (message-yank-original nil) )) -(call-after-loaded - 'tm-edit - (function - (lambda () - (set-alist 'mime-editor/message-inserter-alist - 'message-mode (function message-mime-insert-article)) - (set-alist 'mime-editor/split-message-sender-alist - 'message-mode - (lambda () - (interactive) - (let (message-send-hook - message-sent-message-via) - (message-send) - ))) - ))) +(set-alist 'mime-editor/message-inserter-alist + 'message-mode (function message-mime-insert-article)) +(set-alist 'mime-editor/split-message-sender-alist + 'message-mode + (lambda () + (interactive) + (let (message-send-hook + message-sent-message-via) + (message-send) + ))) ;;; @ end diff --git a/mime-setup.el.in b/mime-setup.el.in index ee120d3..132faf1 100644 --- a/mime-setup.el.in +++ b/mime-setup.el.in @@ -8,7 +8,7 @@ ;;; Maintainer: Shuhei KOBAYASHI ;;; and MORIOKA Tomohiko ;;; Version: -;;; $Id: mime-setup.el.in,v 7.22 1996/08/07 16:42:47 morioka Exp $ +;;; $Id: mime-setup.el.in,v 7.23 1996/08/10 12:04:21 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -141,15 +141,6 @@ (add-hook 'message-header-hook 'mime/encode-message-header) (call-after-loaded - 'tm-edit - (function - (lambda () - (setq message-forward-start-separator - (concat (mime-make-tag "message" "rfc822") "\n")) - ))) -(setq message-forward-end-separator "") - -(call-after-loaded 'message (function (lambda () diff --git a/tm-edit.el b/tm-edit.el index c50c5a1..b8ab369 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.77 $ +;;; Version: $Revision: 7.78 $ ;;; 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.77 1996/08/09 12:16:23 morioka Exp $") + "$Id: tm-edit.el,v 7.78 1996/08/11 13:57:11 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1771,10 +1771,12 @@ Content-Transfer-Encoding: 7bit (defun mime-editor/encrypt-pgp-kazu (beg end boundary) (save-excursion - (let ((from (rfc822/get-field-body "From")) - (to (rfc822/get-field-body "To")) - (cc (rfc822/get-field-body "cc")) - recipients) + (let (from recipients header) + (let ((ret (mime-editor/make-encrypt-recipient-header))) + (setq from (aref ret 0) + recipients (aref ret 1) + header (aref ret 2)) + ) (save-restriction (narrow-to-region beg end) (let* ((ret @@ -1784,24 +1786,7 @@ Content-Transfer-Encoding: 7bit (parts (nth 3 ret)) ) (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 header) (insert (format "Content-Type: %s\n" ctype)) (if encoding (insert (format "Content-Transfer-Encoding: %s\n" encoding)) diff --git a/tm-vm.el b/tm-vm.el index 361d481..e482660 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -1,51 +1,47 @@ -;;; -;;; tm-vm.el --- tm-MUA for VM -;;; -;;; Copyright (C) 1994 MASUTANI Yasuhiro -;;; Copyright (C) 1995 WAKAMIYA Kenji -;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei -;;; Copyright (C) 1996 Oscar Figueiredo -;;; -;;; Author: MASUTANI Yasuhiro -;;; Kenji Wakamiya -;;; MORIOKA Tomohiko -;;; KOBAYASHI Shuhei -;;; Oscar Figueiredo -;;; modified by SHIONO Jun'ichi -;;; ISHIHARA Akito -;;; Rob Kooper -;;; Maintainer: KOBAYASHI Shuhei -;;; Created: 1994/10/29 -;;; Version: $Revision: 7.54 $ -;;; Keywords: mail, MIME, multimedia, 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. -;;; +;;; tm-vm.el --- tm-MUA (MIME Extension module) for VM + +;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc. + +;; Author: MASUTANI Yasuhiro +;; Kenji Wakamiya +;; MORIOKA Tomohiko +;; Shuhei KOBAYASHI +;; Oscar Figueiredo +;; modified by SHIONO Jun'ichi +;; ISHIHARA Akito +;; Rob Kooper +;; Maintainer: Shuhei KOBAYASHI +;; Created: 1994/10/29 +;; Version: $Revision: 7.56 $ +;; Keywords: mail, MIME, multimedia, 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. + ;;; Commentary: -;;; -;;; Plese insert `(require 'tm-vm)' in your ~/.vm file. -;;; + +;; Plese insert `(require 'tm-vm)' in your ~/.vm file. + ;;; Code: (require 'tm-view) (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.54 1996/06/12 23:46:24 shuhei-k Exp $") + "$Id: tm-vm.el,v 7.56 1996/08/12 10:07:35 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -630,6 +626,8 @@ vm-included-text-prefix is prepended to every yanked line." (if (null (buffer-name vm-mail-buffer)) (error "The folder buffer containing message %d has been killed." (vm-number-of message))) + (save-window-excursion + (tm-vm/view-message)) (vm-display nil nil '(vm-yank-message) '(vm-yank-message composing-message)) (setq message (vm-real-message-of message)) @@ -641,7 +639,9 @@ vm-included-text-prefix is prepended to every yanked line." (let* ((mbuf (current-buffer)) (pbuf (and mime::article/preview-buffer (get-buffer mime::article/preview-buffer))) - (pwin (and pbuf (vm-get-visible-buffer-window pbuf)))) + (pwin (and pbuf (save-window-excursion + (vm-get-visible-buffer-window + (switch-to-buffer-other-window pbuf)))))) (if pwin (if running-xemacs (let ((tmp (generate-new-buffer "tm-vm/tmp"))) -- 1.7.10.4