From: morioka Date: Tue, 10 Mar 1998 16:49:05 +0000 (+0000) Subject: tm 7.104. X-Git-Tag: tm-7_104~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7110eca79a127b0b627934466375dbf9d49d9a0;p=elisp%2Ftm.git tm 7.104. --- diff --git a/ChangeLog b/ChangeLog index 710253e..8fd6861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,102 @@ +1997-02-12 MORIOKA Tomohiko + + * emu: Version 7.37.7 was released. + * tm: Version 7.104 was released. + +1997-02-11 MORIOKA Tomohiko + + * TM-MK (make-mime-setup): Delete old mime-setup.el before + generate mime-setup.el if it is exist. + +1997-02-11 MORIOKA Tomohiko + + * tm-ew-e.el (tm-eword::encode-string-1): Unused local variable + `sl' was abolished. + +1997-02-11 MORIOKA Tomohiko + + * tm-pgp.el: Variable `pgp-verify-function', + `pgp-decrypt-function', `pgp-fetch-key-function' and + `pgp-snarf-keys-function' were abolished. + + (pgp-function-alist): New variable. + (pgp-function): New function. + + (mime-article/view-application/pgp): Use `pgp-function' instead of + variable `pgp-verify-function' and `pgp-decrypt-function'. + (mime-article/check-pgp-signature): Use `pgp-function' instead of + variable `pgp-fetch-key-function'. + (mime-article/add-pgp-keys): Use `pgp-function' instead of + variable `pgp-snarf-keys-function'. + +1997-02-11 MORIOKA Tomohiko + + * tm-pgp.el (pgp-fetch-key-function): Function `mc-pgp-fetch-key' + is in mc-pgp.el. + +1997-02-10 MORIOKA Tomohiko + + * tm-image.el (mime-preview/filter-for-application/postscript): + Display message before/after decoding. + + * tm-image.el: Don't require `annotations'. + + * tm-image.el: Variable `mime-preview/x-face-function' was + abolished. + +1997-02-10 MORIOKA Tomohiko + + * tm-image.el: Unused variable `mime-viewer/x-face-to-xbm-command' + was abolished. + + * tm-image.el (mime-preview/filter-for-application/postscript): + New implementation. + +1997-02-10 MORIOKA Tomohiko + + * tm-image.el (image-inline-p): New function. + Variable `tm-image/inline-image-types' was abolished. + (mime-preview/filter-for-image): Add xbm decoding. + Function `mime-preview/filter-for-image/xbm' was abolished. + + * tm-image.el (bitmap-insert-xbm-file): New implementation. + +1997-02-10 MORIOKA Tomohiko + + * tm-image.el: Variable `mime-viewer/shell-command' and + `mime-viewer/shell-arguments' were abolished. + Variable `mime-viewer/graphic-converter-alist' was abolished. + Function `mime-preview/filter-for-inline-image' was abolished. + + (mime-preview/filter-for-image): New implementation; use function + `image-normalize'. + +1997-02-10 MORIOKA Tomohiko + + * tm-setup.el (tm-setup/load-rmail): New function; check variable + `rmail-support-mime' to detect "Radical RMAIL". + +1997-02-10 MORIOKA Tomohiko + + * tm-view.el (mime-viewer/follow-content): Display message if + following method is not implemented. + +1997-02-10 MORIOKA Tomohiko + + * tm-edit.el (mime-editor::edit-again): Delete + application/pgp-signature parts. + +1997-02-07 Steven L. Baur + + * tm-image.el (mime-preview/filter-for-inline-image): Use better + method (cf. [tm-en:1204], [xemacs-beta:2462]) + +1997-02-07 MORIOKA Tomohiko + + * tm-ftp.el (mime-view-ftp-module): New variable; require it if it + is non-nil. + + 1997-02-06 MORIOKA Tomohiko * tm: Version 7.103.5 was released. @@ -208,6 +307,7 @@ Wed Jan 29 15:18:53 1997 MORIOKA Tomohiko * emu: Version 7.37.4 was released. * tl: Version 7.61.16 was released. * MU: Version 0.39.1 was released. + * bitmap-mule: Version 7.16 was released. * tm: Version 7.101 was released. Tue Jan 21 07:23:27 1997 MORIOKA Tomohiko diff --git a/Makefile b/Makefile index ee00ba2..3d20b30 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 7.45 1997/01/10 15:42:29 morioka Exp morioka $ # -VERSION = 7.103.5 +VERSION = 7.104 SHELL = /bin/sh MAKE = make diff --git a/TM-MK b/TM-MK index 12df338..c82b422 100644 --- a/TM-MK +++ b/TM-MK @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-MK,v 7.48 1997/02/06 18:30:30 morioka Exp $ +;;; $Id: TM-MK,v 7.49 1997/02/11 11:31:05 morioka Exp $ ;;; (defun config-tm () @@ -36,10 +36,12 @@ (defun make-mime-setup (lisp-dir tl-path bitmap-path mu-path mel-path tm-path) - (let ((buf - (let (vc-follow-symlinks) - (find-file "mime-setup.el.in") - ))) + (if (file-exists-p "mime-setup.el") + (delete-file "mime-setup.el") + ) + (let ((buf (let (vc-follow-symlinks) + (find-file "mime-setup.el.in") + ))) (goto-char (point-min)) (re-search-forward "^;;; Code:\n" nil t) (setq buffer-read-only nil) diff --git a/tm-edit.el b/tm-edit.el index f7c1bbf..702d74d 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -6,7 +6,7 @@ ;; MORIOKA Tomohiko ;; Maintainer: MORIOKA Tomohiko ;; Created: 1994/08/21 renamed from mime.el -;; Version: $Revision: 7.103 $ +;; Version: $Revision: 7.104 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is part of tm (Tools for MIME). @@ -120,7 +120,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.103 1997/01/31 14:21:10 morioka Exp $") + "$Id: tm-edit.el,v 7.104 1997/02/10 05:49:00 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -2444,7 +2444,10 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (setq type ctype) ) (cond - ((string-equal type "multipart") + ((string= ctype "application/pgp-signature") + (delete-region (point-min)(point-max)) + ) + ((string= type "multipart") (let* ((boundary (assoc-value "boundary" params)) (boundary-pat (concat "\n--" (regexp-quote boundary) "[ \t]*\n")) diff --git a/tm-ew-e.el b/tm-ew-e.el index e8a71bc..afb1fac 100644 --- a/tm-ew-e.el +++ b/tm-ew-e.el @@ -1,9 +1,9 @@ ;;; tm-ew-e.el --- RFC 2047 based encoded-word encoder for GNU Emacs -;; Copyright (C) 1995,1996 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Revision: 7.57 $ +;; Version: $Revision: 7.58 $ ;; Keywords: encoded-word, MIME, multilingual, header, mail, news ;; This file is part of tm (Tools for MIME). @@ -35,7 +35,7 @@ ;;; (defconst tm-ew-e/RCS-ID - "$Id: tm-ew-e.el,v 7.57 1996/12/12 02:30:04 morioka Exp $") + "$Id: tm-ew-e.el,v 7.58 1997/02/11 10:49:13 morioka Exp $") (defconst mime-eword/encoder-version (get-version-string tm-ew-e/RCS-ID)) @@ -316,8 +316,7 @@ when Subject field is encoded by `mime/encode-message-header'. ) (t (setq string (car rword)) - (let* ((sl (length string)) - (p 0) np + (let* ((p 0) np (str "") nstr) (while (and (< p len) (progn diff --git a/tm-ftp.el b/tm-ftp.el index b8db6cf..915e88e 100644 --- a/tm-ftp.el +++ b/tm-ftp.el @@ -5,7 +5,7 @@ ;; Author: MASUTANI Yasuhiro ;; MORIOKA Tomohiko ;; Created: 1994/11/5 -;; Version: $Id: tm-ftp.el,v 7.4 1997/02/01 19:32:36 morioka Exp $ +;; Version: $Id: tm-ftp.el,v 7.5 1997/02/07 02:04:59 morioka Exp $ ;; Keywords: anonymous ftp, MIME, multimedia, mail, news ;; This file is part of tm (Tools for MIME). @@ -28,7 +28,15 @@ ;;; Code: (require 'tm-view) -(require 'ange-ftp) + +(defvar mime-view-ftp-module + (if (< emacs-major-version 19) + 'ange-ftp) + "*Module for ftp file access.") + +(and mime-view-ftp-module + (require mime-view-ftp-module) + ) (defvar mime-article/dired-function (if mime/use-multi-frame diff --git a/tm-image.el b/tm-image.el index 74e1692..bde37a3 100644 --- a/tm-image.el +++ b/tm-image.el @@ -1,17 +1,17 @@ ;;; tm-image.el --- tm-view filter to display images in XEmacs or MULE buffers -;; Copyright (C) 1995,1996 MORIOKA Tomohiko +;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko ;; Copyright (C) 1996 Dan Rich ;; Author: MORIOKA Tomohiko ;; Dan Rich ;; Maintainer: MORIOKA Tomohiko ;; Created: 1995/12/15 -;; Version: $Id: tm-image.el,v 7.15 1996/09/17 04:38:00 morioka Exp $ +;; Version: $Id: tm-image.el,v 7.27 1997/02/10 16:16:21 morioka Exp $ -;; Keywords: mail, news, MIME, multimedia, image, picture, X-Face +;; Keywords: image, picture, X-Face, MIME, multimedia, mail, news -;; This file is part of tm (Tools for MIME). +;; This file is part of XEmacs. ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -24,8 +24,8 @@ ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; along with GNU XEmacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: @@ -37,112 +37,102 @@ (require 'tm-view) (cond (running-xemacs - (require 'annotations) + (require 'images) - (set-alist 'mime-viewer/content-filter-alist - "image/jpeg" - (if (featurep 'jpeg) ; Use built-in suport if available - (function mime-preview/filter-for-inline-image) - (function mime-preview/filter-for-image) - )) + (defun-maybe image-inline-p (format) + (or (memq format image-native-formats) + (find-if (function + (lambda (native) + (image-converter-chain format native) + )) + image-native-formats) + )) - (set-alist 'mime-viewer/content-filter-alist - "image/gif" - (if (featurep 'gif) ; Use built-in suport if available - (function mime-preview/filter-for-inline-image) - (function mime-preview/filter-for-image) - )) - - (set-alist 'mime-viewer/content-filter-alist - "image/x-xpixmap" - (if (featurep 'xpm) ; Use built-in suport if available - (function mime-preview/filter-for-inline-image) - (function mime-preview/filter-for-image) - )) - - (set-alist 'mime-viewer/content-filter-alist - "image/tiff" (function mime-preview/filter-for-image)) - (set-alist 'mime-viewer/content-filter-alist - "image/x-tiff" (function mime-preview/filter-for-image)) - - (set-alist 'mime-viewer/content-filter-alist - "image/x-pic" (function mime-preview/filter-for-image)) - - (set-alist 'mime-viewer/content-filter-alist - "image/x-mag" (function mime-preview/filter-for-image)) - - (defvar tm-image/inline-image-types - (if (featurep 'gif) - (nconc - '("image/jpeg" "image/gif" "image/tiff" - "image/x-tiff" "image/x-pic" "image/x-mag" - "image/x-xbm" "image/x-xpixmap") - (if (featurep 'gif) - '("application/postscript") - ) - ))) + (image-register-netpbm-utilities) + (image-register-converter 'pic 'ppm "pictoppm") + (image-register-converter 'mag 'ppm "magtoppm") (defun bitmap-insert-xbm-file (file) - (let (gl) - (while (progn - (setq gl (make-glyph file)) - (eq (image-instance-type (glyph-image-instance gl)) - 'text) - )) - (make-annotation gl (point) 'text) - )) - - (defvar mime-viewer/image-converter-alist - '(("image/jpeg" . jpeg) - ("image/gif" . gif) - ("image/x-png" . png) - ("image/x-xpixmap" . xpm) + (let ((gl (make-glyph (list (cons 'x file)))) + (e (make-extent (point) (point))) + ) + (set-extent-end-glyph e gl) )) - (defvar mime-preview/x-face-function - (function mime-preview/x-face-function-use-highlight-headers)) - + ;; + ;; X-Face + ;; (autoload 'highlight-headers "highlight-headers") (defun mime-preview/x-face-function-use-highlight-headers () (highlight-headers (point-min) (re-search-forward "^$" nil t) t) ) + + (add-hook 'mime-viewer/content-header-filter-hook + 'mime-preview/x-face-function-use-highlight-headers) + ) ((featurep 'mule) ;; for MULE 2.* or mule merged EMACS (require 'x-face-mule) + + (defvar image-native-formats '(xbm)) - (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm")) + (defun-maybe image-inline-p (format) + (memq format image-native-formats) + ) + + (defun-maybe image-normalize (format data) + (and (eq format 'xbm) + (vector 'xbm ':data data) + )) - (defvar mime-preview/x-face-function - (function x-face-decode-message-header)) + ;; + ;; X-Face + ;; + (add-hook 'mime-viewer/content-header-filter-hook + 'x-face-decode-message-header) )) -(defvar mime-viewer/shell-command "/bin/sh") -(defvar mime-viewer/shell-arguments '("-c")) +(or (fboundp 'image-invalid-glyph-p) + (defsubst image-invalid-glyph-p (glyph) + (or (null (aref glyph 0)) + (null (aref glyph 2)) + (equal (aref glyph 2) "") + )) + ) -(defvar mime-viewer/ps-to-gif-command "pstogif") +(defvar mime-viewer/image-converter-alist nil) -(defvar mime-viewer/graphic-converter-alist - '(("image/jpeg" . "djpeg -color 256 < %s | ppmtoxpm > %s") - ("image/gif" . "giftopnm < %s | ppmtoxpm > %s") - ("image/tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-pic" . "pictoppm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-mag" . "magtoppm < %s | ppmtoxpm > %s") - )) - - -;;; @ X-Face -;;; - -(defvar mime-viewer/x-face-to-xbm-command - (concat mime-viewer/x-face-to-pbm-command " | pbmtoxbm")) +(mapcar (function + (lambda (rule) + (let ((ctype (car rule)) + (format (cdr rule)) + ) + (if (image-inline-p format) + (progn + (set-alist 'mime-viewer/content-filter-alist + ctype + (function mime-preview/filter-for-image)) + (set-alist 'mime-viewer/image-converter-alist + ctype format) + (add-to-list + 'mime-viewer/default-showing-Content-Type-list + ctype) + ) + )))) + '(("image/jpeg" . jpeg) + ("image/gif" . gif) + ("image/tiff" . tiff) + ("image/x-tiff" . tiff) + ("image/xbm" . xbm) + ("image/x-xbm" . xbm) + ("image/x-xpixmap" . xpm) + ("image/x-pic" . pic) + ("image/x-mag" . mag) + )) -(if mime-preview/x-face-function - (add-hook 'mime-viewer/content-header-filter-hook - mime-preview/x-face-function) - ) +(defvar mime-viewer/ps-to-gif-command "pstogif") ;;; @ content filter for images @@ -152,86 +142,38 @@ (defun mime-preview/filter-for-image (ctype params encoding) (let* ((mode mime::preview/original-major-mode) (m (assq mode mime-viewer/code-converter-alist)) - (filter (assoc-value ctype mime-viewer/graphic-converter-alist)) - ) - (if filter - (let* ((beg (point-min)) (end (point-max)) - (orig-file - (make-temp-name (expand-file-name "tm" mime/tmp-dir))) - (xbm-file (concat orig-file ".xbm")) - gl annot) - ;;(remove-text-properties beg end '(face nil)) - (mime-decode-region beg end encoding) - (write-region (point-min)(point-max) orig-file) - (delete-region (point-min)(point-max)) - (message "Now translating, please wait...") - (apply (function call-process) - mime-viewer/shell-command nil nil nil - (append mime-viewer/shell-arguments - (list (format filter orig-file xbm-file))) - ) - (setq gl (make-glyph xbm-file)) - (setq annot (make-annotation gl (point) 'text)) - (unwind-protect - (delete-file orig-file) - (condition-case nil - (delete-file xbm-file) - (error nil))) - (goto-char (point-max)) - (insert "\n") - (message "Translation done.") - ) - (message (format "%s is not supported." ctype)) - ))) - - -;;; @ content filter for xbm -;;; - -(defun mime-preview/filter-for-image/xbm (ctype params encoding) - (let* ((mode mime::preview/original-major-mode) - (m (assq mode mime-viewer/code-converter-alist)) (charset (assoc "charset" params)) (beg (point-min)) (end (point-max)) - (xbm-file (make-temp-name (expand-file-name "tm" mime/tmp-dir))) ) (remove-text-properties beg end '(face nil)) + (message "Decoding image...") (mime-decode-region beg end encoding) - (write-region (point-min)(point-max) xbm-file) - (delete-region (point-min)(point-max)) - (bitmap-insert-xbm-file xbm-file) - (delete-file xbm-file) - )) - -(set-alist 'mime-viewer/content-filter-alist - "image/xbm" (function mime-preview/filter-for-image/xbm)) - -(set-alist 'mime-viewer/content-filter-alist - "image/x-xbm" (function mime-preview/filter-for-image/xbm)) - - -;;; @ content filter for support in-line image types -;;; -;; (for XEmacs 19.14 or later) - -(defun mime-preview/filter-for-inline-image (ctype params encoding) - (let* ((mode mime::preview/original-major-mode) - (m (assq mode mime-viewer/code-converter-alist)) - (charset (assoc "charset" params)) - (beg (point-min)) (end (point-max)) - ) - (remove-text-properties beg end '(face nil)) - (mime-decode-region beg end encoding) - (let ((data (buffer-string)) - (minor (assoc-value ctype mime-viewer/image-converter-alist)) - gl) + (let* ((minor (assoc-value ctype mime-viewer/image-converter-alist)) + (gl (image-normalize minor (buffer-string))) + e) (delete-region (point-min)(point-max)) - (while (progn - (setq gl (make-glyph (vector minor :data data))) - (eq (image-instance-type (glyph-image-instance gl)) - 'text) - )) - (make-annotation gl (point) 'text) + (cond ((image-invalid-glyph-p gl) + (setq gl nil) + (message "Invalid glyph!") + ) + ((eq (aref gl 0) 'xbm) + (let ((xbm-file + (make-temp-name (expand-file-name "tm" mime/tmp-dir)))) + (insert (aref gl 2)) + (write-region (point-min)(point-max) xbm-file) + (message "Decoding image...") + (delete-region (point-min)(point-max)) + (bitmap-insert-xbm-file xbm-file) + (delete-file xbm-file) + ) + (message "Decoding image... done") + ) + (t + (setq gl (make-glyph gl)) + (setq e (make-extent (point) (point))) + (set-extent-end-glyph e gl) + (message "Decoding image... done") + )) ) (insert "\n") )) @@ -250,18 +192,15 @@ (gif-file (concat file-base ".gif")) ) (remove-text-properties beg end '(face nil)) + (message "Decoding Postscript...") (mime-decode-region beg end encoding) (write-region (point-min)(point-max) ps-file) + (message "Decoding Postscript...") (delete-region (point-min)(point-max)) (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))) - (eq (image-instance-type (glyph-image-instance gl)) - 'text) - )) - (make-annotation gl (point) 'text) - ) + (set-extent-end-glyph (make-extent (point) (point)) + (make-glyph (vector 'gif :file gif-file))) + (message "Decoding Postscript... done") (delete-file ps-file) (delete-file gif-file) )) @@ -270,18 +209,10 @@ "application/postscript" (function mime-preview/filter-for-application/postscript)) - -;;; @ setting -;;; - -(mapcar - (lambda (ctype) - (or (member ctype mime-viewer/default-showing-Content-Type-list) - (setq mime-viewer/default-showing-Content-Type-list - (cons ctype - mime-viewer/default-showing-Content-Type-list)) - )) - tm-image/inline-image-types) +(if (featurep 'gif) + (add-to-list 'mime-viewer/default-showing-Content-Type-list + "application/postscript") + ) ;;; @ end diff --git a/tm-pgp.el b/tm-pgp.el index cafdb9f..3b439fd 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1995/12/7 -;; Version: $Id: tm-pgp.el,v 7.28 1997/01/29 15:18:53 morioka Exp $ +;; Version: $Id: tm-pgp.el,v 7.30 1997/02/11 08:57:58 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, PGP, security ;; This file is part of tm (Tools for MIME). @@ -42,22 +42,22 @@ (require 'tm-play) -(defvar pgp-verify-function - 'mc-verify "*PGP verify function.") - -(defvar pgp-decrypt-function - 'mc-decrypt "*PGP decrypt function.") - -(defvar pgp-fetch-key-function - 'mc-pgp-fetch-key "*PGP fetch key function.") +(defvar pgp-function-alist + '((verify mc-verify "mc-toplev") + (decrypt mc-decrypt "mc-toplev") + (fetch-key mc-pgp-fetch-key "mc-pgp") + (snarf-keys mc-snarf-keys "mc-toplev") + )) -(defvar pgp-snarf-keys-function - 'mc-snarf-keys "*PGP snarf keys function.") +(defsubst pgp-function (method) + (car (cdr (assq method pgp-function-alist))) + ) -(autoload pgp-verify-function "mc-toplev") -(autoload pgp-decrypt-function "mc-toplev") -(autoload pgp-fetch-key-function "mc-toplev") -(autoload pgp-snarf-keys-function "mc-toplev") +(mapcar (function + (lambda (method) + (autoload (second method)(third method)) + )) + pgp-function-alist) ;;; @ internal method for application/pgp @@ -80,7 +80,7 @@ (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t) ) - (funcall pgp-verify-function) + (funcall (pgp-function 'verify)) (goto-char (point-min)) (delete-region (point-min) @@ -106,7 +106,7 @@ (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t) ) - (as-binary-process (funcall pgp-decrypt-function)) + (as-binary-process (funcall (pgp-function 'decrypt))) (goto-char (point-min)) (delete-region (point-min) (and @@ -241,7 +241,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (format "Key %s not found; attempt to fetch? " pgp-id)) ) (progn - (funcall pgp-fetch-key-function (cons nil pgp-id)) + (funcall (pgp-function 'fetch-key) (cons nil pgp-id)) (mime::article/call-pgp-to-check-signature mime/output-buffer-name orig-file) )) @@ -309,7 +309,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (delete-region (point-min) (match-end 0)) ) (mime-decode-region (point-min)(point-max) encoding) - (funcall pgp-snarf-keys-function) + (funcall (pgp-function 'snarf-keys)) (kill-buffer (current-buffer)) )) diff --git a/tm-setup.el b/tm-setup.el index b230b47..f422be2 100644 --- a/tm-setup.el +++ b/tm-setup.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: tm-setup.el,v 7.10 1997/02/01 19:17:38 morioka Exp $ +;; Version: $Id: tm-setup.el,v 7.11 1997/02/10 06:11:06 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;; This file is part of tm (Tools for MIME). @@ -98,14 +98,15 @@ ;;; @ for RMAIL ;;; -(or running-xemacs-with-mule - (call-after-loaded 'rmail - (function - (lambda () - (require 'tm-rmail) - )) - 'rmail-mode-hook) - ) +(defun tm-setup/load-rmail () + (or (and (boundp 'rmail-support-mime) + rmail-support-mime) + (require 'tm-rmail) + ) + (remove-hook 'rmail-mode-hook 'tm-setup/load-rmail) + ) + +(call-after-loaded 'rmail 'tm-setup/load-rmail 'rmail-mode-hook) ;;; @ for mh-e diff --git a/tm-view.el b/tm-view.el index 07f2aae..e84e33f 100644 --- a/tm-view.el +++ b/tm-view.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;; Version: $Revision: 7.80 $ +;; Version: $Revision: 7.81 $ ;; Keywords: mail, news, MIME, multimedia ;; This file is part of tm (Tools for MIME). @@ -42,7 +42,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.80 1997/01/31 12:59:06 morioka Exp $") + "$Id: tm-view.el,v 7.81 1997/02/10 06:03:38 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -1007,8 +1007,14 @@ button-2 Move to point under the mouse cursor )) (mime/decode-message-header) ) - (funcall (cdr (assq mode mime-viewer/following-method-alist)) - new-buf) + (let ((f (cdr (assq mode mime-viewer/following-method-alist)))) + (if (functionp f) + (funcall f new-buf) + (message + (format + "Sorry, following method for %s is not implemented yet." + mode)) + )) )))) (defun mime-viewer/display-x-face ()