From 8ad5dcf75c50e1db649758764f802afef3e3bbd6 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:37:27 +0000 Subject: [PATCH] tm 7.72. --- ChangeLog | 63 +++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- gnus/ChangeLog | 53 +++++++++++++++++++++++++++++++++++++ gnus/tm-gnus5.el | 67 +++++++++++++++++++++++----------------------- mh-e/ChangeLog | 10 +++++++ mh-e/tm-mh-e.el | 7 +++-- tm-def.el | 78 +++++++++++++----------------------------------------- tm-edit.el | 18 ++++++------- tm-ew-d.el | 6 ++--- tm-image.el | 6 +++-- tm-pgp.el | 13 +++++---- tm-play.el | 11 +++++--- 12 files changed, 211 insertions(+), 123 deletions(-) diff --git a/ChangeLog b/ChangeLog index 778018b..3002bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,65 @@ +Wed Jul 17 05:36:50 1996 MORIOKA Tomohiko + + * tl: Version 7.43 was released. + * tm: Version 7.72 was released. + * tm/mh-e: Version 7.64 was released. + * tm/gnus: Version 7.78 was released. + +Mon Jul 15 19:21:48 1996 MORIOKA Tomohiko + + * tm-image.el (mime-viewer/ps-to-gif-command): New variable. + (mime-preview/filter-for-application/postscript): Use variable + `mime-viewer/ps-to-gif-command'. + +Mon Jul 15 14:04:46 1996 MORIOKA Tomohiko + + * tm-play.el (mime-article/show-output-buffer): use variable + `mime/output-buffer-window-is-shared-with-bbdb'. + + * tm-def.el (mime/output-buffer-window-is-shared-with-bbdb): New + variable. + + * tm-pgp.el (mime-article/check-pgp-signature): Don't check + *noconv*. + +Mon Jul 15 13:59:43 1996 MORIOKA Tomohiko + + * tm-pgp.el (mime-article/check-pgp-signature): fixed for new spec + of function `mime-article/show-output-buffer'. + + * tm-play.el (mime-article/show-output-buffer): Select a window + contains preview-buffer if there is no windows contain + mime/output-buffer-name. + + * tm-def.el (tm:button-dispatcher): New implementation. + +Mon Jul 15 08:19:01 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor::edit-again): Use function + `decode-mime-charset-region' instead of + `mime-charset-decode-region' and `character-decode-region'; Use + variable `default-mime-charset' instead of + `mime/default-coding-system'. + +Sun Jul 14 15:04:35 1996 MORIOKA Tomohiko + + * tm-def.el: Variable `mime/default-coding-system' was abolished. + + * tm-def.el: Variable `mime/charset-coding-system-alist' was + abolished. + + * tm-def.el (mime-charset-decode-region): Use function + `decode-mime-charset-region'. + +Sun Jul 14 11:40:02 1996 MORIOKA Tomohiko + + * tm-ew-d.el (mime/decode-encoded-text): Use function + `decode-mime-charset-string' instead of + `mime-charset-decode-string'. + + * tm-def.el: Function `mime-charset-decode-string' was abolished. + + Thu Jul 11 15:26:54 1996 MORIOKA Tomohiko * tl: Version 7.36 was released. @@ -98,6 +160,7 @@ Tue Jul 9 13:30:32 1996 MORIOKA Tomohiko * tl: Version 7.31.1 was released. * tm: Version 7.70 was released. + * tm/gnus: Version 7.73 was released. * tm-edit.el (mime/editor-mode): Don't toggle. (mime-editor/toggle-mode): New function. diff --git a/Makefile b/Makefile index 9856810..c4e6159 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.71.tar.gz +TARFILE = tm7.72.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 02161e3..2079d1e 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,56 @@ +Wed Jul 17 05:39:11 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.78 was released. + +Sun Jul 14 16:37:27 1996 MORIOKA Tomohiko + + * tm-gnus5.el: Set newsgroup default charset for alt.chinese + instead of alt.chinese.text. + + Add newsgroup default charset for hk and hkstar. + +Sun Jul 14 16:05:42 1996 MORIOKA Tomohiko + + * tm-gnus5.el (tm-gnus/decode-summary-from-and-subjects): fixed to + use variable `gnus-newsgroup-default-charset-alist' instead of + `gnus-newsgroup-default-coding-system-alist'. + +Sun Jul 14 15:49:03 1996 MORIOKA Tomohiko + + * tm-gnus5.el (gnus-newsgroup-default-charset-alist): New + variable; renamed from + `gnus-newsgroup-default-coding-system-alist'. + + (gnus-set-newsgroup-default-charset): New function; renamed from + `gnus-set-newsgroup-default-coding-system'. + +Sun Jul 14 15:19:54 1996 MORIOKA Tomohiko + + * tm-gnus5.el (tm-gnus/content-header-filter): Use variable + `default-mime-charset' instead of `mime/default-coding-system'. + + (tm-gnus/preview-article): Use variable `default-mime-charset' + instead of `mime/default-coding-system'. + + (tm-gnus/article-decode-encoded-word): Use function + `decode-mime-charset-region' instead of `character-decode-region'; + Use variable `default-mime-charset' instead of + `mime/default-coding-system'. + + (tm-gnus/decode-summary-from-and-subjects): Use variable + `default-mime-charset' instead of `mime/default-coding-system'; + Use function `decode-mime-charset-string' instead of + `character-decode-string'. + + +Tue Jul 9 13:30:32 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.73 was released. + + * tm-gnus5.el (tm-gnus/preview-article): specify + `gnus-article-mode-map' as mother keymap. + + Thu Jun 27 15:19:48 1996 MORIOKA Tomohiko * tm/gnus: Version 7.72 was released. diff --git a/gnus/tm-gnus5.el b/gnus/tm-gnus5.el index 78db566..6933782 100644 --- a/gnus/tm-gnus5.el +++ b/gnus/tm-gnus5.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; and KOBAYASHI Shuhei ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.72 $ +;;; Version: $Revision: 7.78 $ ;;; 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-gnus5.el,v 7.72 1996/06/27 14:35:40 morioka Exp morioka $") + "$Id: tm-gnus5.el,v 7.78 1996/07/14 16:37:27 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for Gnus 5.2 or later")) @@ -114,8 +114,7 @@ This variable is set to `gnus-show-mime'.") (defun tm-gnus/content-header-filter () (goto-char (point-min)) (mime-preview/cut-header) - (mime-charset-decode-region (point-min)(point-max) - mime/default-coding-system) + (mime-charset-decode-region (point-min)(point-max) default-mime-charset) (mime/decode-message-header) ) @@ -228,10 +227,11 @@ This variable is set to `gnus-show-mime'.") (setq tm:mother-button-dispatcher (function gnus-article-push-button)) (let ((mime-viewer/ignored-field-regexp "^:$") - (mime/default-coding-system - (save-excursion - (set-buffer gnus-summary-buffer) - mime/default-coding-system))) + (default-mime-charset + (save-excursion + (set-buffer gnus-summary-buffer) + default-mime-charset)) + ) (mime/viewer-mode nil nil nil gnus-original-article-buffer gnus-article-buffer gnus-article-mode-map) @@ -243,10 +243,10 @@ This variable is set to `gnus-show-mime'.") (setq gnus-show-mime-method (function tm-gnus/preview-article)) (defun tm-gnus/article-decode-encoded-word () - (character-decode-region (point-min)(point-max) - (save-excursion - (set-buffer gnus-summary-buffer) - mime/default-coding-system)) + (decode-mime-charset-region (point-min)(point-max) + (save-excursion + (set-buffer gnus-summary-buffer) + default-mime-charset)) (mime/decode-message-header) (run-hooks 'tm-gnus/article-prepare-hook) ) @@ -255,20 +255,20 @@ This variable is set to `gnus-show-mime'.") (function tm-gnus/article-decode-encoded-word)) -;;; @ for MULE +;;; @ for mule (Multilingual support) ;;; -(defvar gnus-newsgroup-default-coding-system-alist nil) +(defvar gnus-newsgroup-default-charset-alist nil) -(defun gnus-set-newsgroup-default-coding-system (ng cs) - "Define CS as default coding system for newsgroup NG." - (set-alist 'gnus-newsgroup-default-coding-system-alist - (concat "^" (regexp-quote ng) "\\($\\|\\.\\)") - cs)) +(defun gnus-set-newsgroup-default-charset (newsgroup charset) + "Set CHARSET for the NEWSGROUP as default MIME charset." + (set-alist 'gnus-newsgroup-default-charset-alist + (concat "^" (regexp-quote newsgroup) "\\($\\|\\.\\)") + charset)) (cond ((featurep 'mule) - (cond ((boundp 'MULE) + (cond ((boundp 'MULE) ; for MULE 1.* and 2.*. (define-service-coding-system gnus-nntp-service nil *noconv*) (if (and (boundp 'nntp-server-process) (processp nntp-server-process) @@ -276,7 +276,7 @@ This variable is set to `gnus-show-mime'.") (set-process-coding-system nntp-server-process *noconv* *noconv*) ) ) - (running-xemacs-20 + (running-xemacs-20 ; for XEmacs/mule. (if (and (boundp 'nntp-server-process) (processp nntp-server-process) ) @@ -320,12 +320,13 @@ This variable is set to `gnus-show-mime'.") (add-hook 'nnmail-prepare-save-mail-hook 'tm-gnus/prepare-save-mail-function) - (gnus-set-newsgroup-default-coding-system "alt.chinese.text" *hz*) - (gnus-set-newsgroup-default-coding-system "alt.chinese.text.big5" *big5*) - (gnus-set-newsgroup-default-coding-system "tw" *big5*) - (gnus-set-newsgroup-default-coding-system "han" *euc-kr*) - (and (boundp '*koi8*) - (gnus-set-newsgroup-default-coding-system "relcom" *koi8*)) + (gnus-set-newsgroup-default-charset "alt.chinese" 'hz) + (gnus-set-newsgroup-default-charset "alt.chinese.text.big5" 'big5) + (gnus-set-newsgroup-default-charset "tw" 'big5) + (gnus-set-newsgroup-default-charset "hk" 'big5) + (gnus-set-newsgroup-default-charset "hkstar" 'big5) + (gnus-set-newsgroup-default-charset "han" 'euc-kr) + (gnus-set-newsgroup-default-charset "relcom" 'koi8-r) )) @@ -333,15 +334,15 @@ This variable is set to `gnus-show-mime'.") ;;; (defun tm-gnus/decode-summary-from-and-subjects () - (let ((rest gnus-newsgroup-default-coding-system-alist) + (let ((rest gnus-newsgroup-default-charset-alist) cell) (catch 'tag (while (setq cell (car rest)) (if (string-match (car cell) gnus-newsgroup-name) (throw 'tag (progn - (make-local-variable 'mime/default-coding-system) - (setq mime/default-coding-system (cdr cell)) + (make-local-variable 'default-mime-charset) + (setq default-mime-charset (cdr cell)) ))) (setq rest (cdr rest)) ))) @@ -354,9 +355,9 @@ This variable is set to `gnus-show-mime'.") (if (eq method 'nntp) (progn (setq from - (character-decode-string from mime/default-coding-system)) + (decode-mime-charset-string from default-mime-charset)) (setq subj - (character-decode-string subj mime/default-coding-system)) + (decode-mime-charset-string subj default-mime-charset)) )) (mail-header-set-from header (mime-eword/decode-string from)) @@ -364,7 +365,7 @@ This variable is set to `gnus-show-mime'.") header (mime-eword/decode-string subj)) )) gnus-newsgroup-headers)) - + (or (boundp 'nnheader-encoded-words-decoding) (add-hook 'gnus-select-group-hook 'tm-gnus/decode-summary-from-and-subjects) diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index c5fb215..df9b47b 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,13 @@ +Wed Jul 17 05:38:04 1996 MORIOKA Tomohiko + + * tm/mh-e: Version 7.64 was released. + +Sun Jul 14 15:08:16 1996 MORIOKA Tomohiko + + * tm-mh-e.el (tm-mh-e/content-header-filter): Use variable + `default-mime-charset' instead of mime/default-coding-system. + + Thu Jun 27 15:39:16 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.63.1 was released. diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index d0c4b25..7c71725 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.63 $ +;;; Version: $Revision: 7.64 $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -50,7 +50,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.63 1996/05/30 00:18:04 morioka Exp $") + "$Id: tm-mh-e.el,v 7.64 1996/07/14 15:08:16 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) @@ -261,8 +261,7 @@ digest are inserted into the folder after that message." (defun tm-mh-e/content-header-filter () (goto-char (point-min)) (mime-preview/cut-header) - (tm-mh-e/charset-decode-region (point-min)(point-max) - mime/default-coding-system) + (tm-mh-e/charset-decode-region (point-min)(point-max) default-mime-charset) (mime/decode-message-header) ) diff --git a/tm-def.el b/tm-def.el index f2c373a..321a2e9 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.55 1996/07/11 15:26:54 morioka Exp $ +;;; $Id: tm-def.el,v 7.61 1996/07/15 14:03:57 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). @@ -45,6 +45,9 @@ (function find-file) )) +(defvar mime/output-buffer-window-is-shared-with-bbdb t + "*If t, mime/output-buffer window is shared with BBDB window.") + ;;; @ constants ;;; @@ -98,61 +101,9 @@ ;;; @ coding-system ;;; -(defvar mime/charset-coding-system-alist - (let* (csl - (f (if (and running-xemacs-20 (featurep 'mule)) - (progn - (setq csl (coding-system-list)) - (function - (lambda (a cell) - (if (memq (cdr cell) csl) - (cons cell a) - a)))) - (function - (lambda (a cell) - (let ((sym (symbol-concat "*" (cdr cell) "*"))) - (if (boundp sym) - (cons (cons (car cell) (symbol-value sym)) a) - a)))) - ))) - (foldr f nil - '(("ISO-2022-JP" . junet) - ("ISO-2022-KR" . iso-2022-kr) - ("EUC-KR" . euc-kr) - ("GB2312" . euc-china) - ("ISO-8859-1" . ctext) - ("ISO-8859-2" . iso-8859-2) - ("ISO-8859-3" . iso-8859-3) - ("ISO-8859-4" . iso-8859-4) - ("ISO-8859-5" . iso-8859-5) - ("KOI8-R" . koi8) - ("ISO-8859-7" . iso-8859-7) - ("ISO-8859-8" . iso-8859-8) - ("ISO-8859-9" . iso-8859-9) - ("ISO-2022-JP-2" . iso-2022-ss2-7) - ("X-ISO-2022-JP-2" . iso-2022-ss2-7) - ("ISO-2022-INT-1" . iso-2022-int-1) - ("SHIFT_JIS" . sjis) - ("X-SHIFTJIS" . sjis) - ("BIG5" . big5) - )))) - -(defvar mime/default-coding-system *ctext*) - -(defun mime-charset-decode-string (str charset) - (let ((cs (assoc charset mime/charset-coding-system-alist))) - (if cs - (character-decode-string str (cdr cs)) - ))) - (defun mime-charset-decode-region (beg end charset &optional encoding) - (let ((ct - (if (stringp charset) - (cdr (assoc (upcase charset) mime/charset-coding-system-alist)) - mime/default-coding-system))) - (if ct - (character-decode-region beg end ct) - ))) + (decode-mime-charset-region beg end (or charset default-mime-charset)) + ) ;;; @ button @@ -183,11 +134,18 @@ (defun tm:button-dispatcher (event) "Select the button under point." (interactive "e") - (save-window-excursion - (mouse-set-point event) - (let ((func (get-text-property (point) 'tm-callback)) - (data (get-text-property (point) 'tm-data)) - ) + (let (buf point func data) + (save-window-excursion + (mouse-set-point event) + (setq buf (current-buffer) + point (point) + func (get-text-property (point) 'tm-callback) + data (get-text-property (point) 'tm-data) + ) + ) + (save-excursion + (set-buffer buf) + (goto-char point) (if func (apply func data) (if (fboundp tm:mother-button-dispatcher) diff --git a/tm-edit.el b/tm-edit.el index 4bd613c..a1061a5 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.71 $ +;;; Version: $Revision: 7.72 $ ;;; 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.71 1996/07/11 14:54:06 morioka Exp $") + "$Id: tm-edit.el,v 7.72 1996/07/15 08:19:01 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -2641,12 +2641,10 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" encoding nil) ))))))) (if (or code-conversion encoded) - (if charset - (mime-charset-decode-region (point-min)(point-max) - charset) - (character-decode-region (point-min)(point-max) - mime/default-coding-system) - )) + (decode-mime-charset-region + (point-min)(point-max) + (or charset default-mime-charset)) + ) (let ((he (if (re-search-forward "^$" nil t) (match-end 0) @@ -2667,8 +2665,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" )) )))) (if code-conversion - (character-decode-region (point-min) (point-max) - mime/default-coding-system) + (decode-mime-charset-region (point-min) (point-max) + default-mime-charset) ) )))) diff --git a/tm-ew-d.el b/tm-ew-d.el index 411d1c6..fb9ccf4 100644 --- a/tm-ew-d.el +++ b/tm-ew-d.el @@ -10,7 +10,7 @@ ;;; MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/6/3 (1995/10/3 obsolete tiny-mime.el) -;;; Version: $Revision: 7.12 $ +;;; Version: $Revision: 7.13 $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-ew-d/RCS-ID - "$Id: tm-ew-d.el,v 7.12 1996/05/09 18:18:51 morioka Exp $") + "$Id: tm-ew-d.el,v 7.13 1996/07/14 11:40:02 morioka Exp $") (defconst mime/eword-decoder-version (get-version-string tm-ew-d/RCS-ID)) @@ -184,7 +184,7 @@ (t (message "unknown encoding %s" encoding) nil)))) (if dest - (mime-charset-decode-string dest charset) + (decode-mime-charset-string dest charset) ))) diff --git a/tm-image.el b/tm-image.el index 7dc7228..384269b 100644 --- a/tm-image.el +++ b/tm-image.el @@ -10,7 +10,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/15 ;;; Version: -;;; $Id: tm-image.el,v 7.9 1996/07/08 05:44:22 morioka Exp $ +;;; $Id: tm-image.el,v 7.10 1996/07/15 19:21:48 morioka Exp $ ;;; ;;; Keywords: mail, news, MIME, multimedia, image, picture ;;; @@ -124,6 +124,8 @@ (defvar mime-viewer/shell-command "/bin/sh") (defvar mime-viewer/shell-arguments '("-c")) +(defvar mime-viewer/ps-to-gif-command "pstogif") + (defvar mime-viewer/graphic-converter-alist '(("image/jpeg" . "djpeg -color 256 < %s | ppmtoxpm > %s") ("image/gif" . "giftopnm < %s | ppmtoxpm > %s") @@ -282,7 +284,7 @@ (mime-decode-region beg end encoding) (write-region (point-min)(point-max) ps-file) (delete-region (point-min)(point-max)) - (call-process "pstogif" nil nil nil ps-file) + (call-process mime-viewer/ps-to-gif-command nil nil nil ps-file) (let (gl) (while (progn (setq gl (make-glyph (vector 'gif :file gif-file))) diff --git a/tm-pgp.el b/tm-pgp.el index 6cc7378..4e8635e 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/7 ;;; Version: -;;; $Id: tm-pgp.el,v 7.16 1996/06/27 14:26:56 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.18 1996/07/15 14:03:34 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -169,8 +169,7 @@ (replace-match "\r\n") ) (let ((mc-flag nil) ; for Mule - (file-coding-system - (if (featurep 'mule) *noconv*)) + (file-coding-system *noconv*) kanji-flag ; for NEmacs (emx-binary-mode t) ; for OS/2 jka-compr-compression-info-list ; for jka-compr @@ -181,6 +180,9 @@ (kill-buffer (current-buffer)) ) (save-excursion + (mime-article/show-output-buffer) + ) + (save-excursion (setq str (buffer-substring (save-excursion (goto-char beg) @@ -191,8 +193,7 @@ (insert str) (mime-decode-region (point-min)(point-max) encoding) (let ((mc-flag nil) ; for Mule - (file-coding-system - (if (featurep 'mule) *noconv*)) + (file-coding-system *noconv*) kanji-flag ; for NEmacs (emx-binary-mode t) ; for OS/2 jka-compr-compression-info-list ; for jka-compr @@ -200,8 +201,6 @@ require-final-newline) (write-file sig-file) ) - ;;(define-program-coding-system (current-buffer) "pgp" *noconv*) - (mime-article/show-output-buffer) ;;(get-buffer-create mime/output-buffer-name) (or (mime::article/call-pgp-to-check-signature mime/output-buffer-name orig-file) diff --git a/tm-play.el b/tm-play.el index 67fa392..7d0e768 100644 --- a/tm-play.el +++ b/tm-play.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/9/26 (separated from tm-view.el) ;;; Version: -;;; $Id: tm-play.el,v 7.18 1996/05/11 10:09:00 morioka Exp $ +;;; $Id: tm-play.el,v 7.20 1996/07/15 14:04:46 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -197,8 +197,13 @@ (let ((the-win (selected-window)) (win (get-buffer-window mime/output-buffer-name)) ) - (if (null win) - (progn + (or win + (if (and mime/output-buffer-window-is-shared-with-bbdb + (boundp 'bbdb-buffer-name) + (setq win (get-buffer-window bbdb-buffer-name)) + ) + (set-window-buffer win mime/output-buffer-name) + (select-window (get-buffer-window mime::article/preview-buffer)) (setq win (split-window-vertically (/ (* (window-height) 3) 4))) (set-window-buffer win mime/output-buffer-name) )) -- 1.7.10.4