From 0275741d6c108099a90adc9bebb4b48c91f1aa55 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 10 Mar 1998 17:20:35 +0000 Subject: [PATCH] tm 7.105. --- ChangeLog | 47 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- tm-def.el | 44 ++++++++++++++++++++++++++++++++++++++++++-- tm-edit.el | 26 ++++++++------------------ tm-image.el | 8 +++++--- tm-pgp.el | 26 ++++++-------------------- 6 files changed, 109 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fd6861..83e01b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +1997-02-13 MORIOKA Tomohiko + + * emu: Version 7.38 was released. + * tm: Version 7.105 was released. + * tm-vm: Version 8.9 was released. + * tm-mail: Version 7.30 was released. + + * tm-pgp.el (mime-article/view-application/pgp): fixed problem + about window-configuration. + +1997-02-13 MORIOKA Tomohiko + + * tm-def.el (pgp-function-alist): Add new services for tm-edit. + + * tm-edit.el (mime-editor/insert-text): DOC-string was fixed. + + Variable `mime-editor/pgp-sign-function', + `mime-editor/pgp-encrypt-function', + `mime-editor/traditional-pgp-sign-function' and + `mime-editor/pgp-insert-public-key-function' were abolished. + + (mime-editor/sign-pgp-elkins): Use macro `pgp-function' instead of + variable `mime-editor/pgp-sign-function'. + (mime-editor/encrypt-pgp-elkins): Use macro `pgp-function' instead + of variable `mime-editor/pgp-encrypt-function'. + (mime-editor/sign-pgp-kazu): Use macro `pgp-function' instead of + variable `mime-editor/traditional-pgp-sign-function'. + (mime-editor/encrypt-pgp-kazu): Use macro `pgp-function' instead + of variable `mime-editor/pgp-encrypt-function'. + (mime-editor/insert-key): Use macro `pgp-function' instead of + variable `mime-editor/pgp-insert-public-key-function'. + + * tm-def.el (pgp-function-alist): New variable; moved from + tm-pgp.el. + (pgp-function): New macro; moved from tm-pgp.el. + + * tm-pgp.el: Variable `pgp-function-alist' and macro + `pgp-function' were moved to tm-def.el. + + * tm-pgp.el (pgp-function): Changed to macro. + + * tm-image.el (mime-viewer/content-header-filter-hook): Check + `uncompface-program' is installed or not if MULE or Emacs/mule is + running. + + 1997-02-12 MORIOKA Tomohiko * emu: Version 7.37.7 was released. @@ -497,6 +543,7 @@ Tue Dec 17 13:05:57 1996 MORIOKA Tomohiko * tm: Version 7.97 was released. * tm-mh-e: Version 7.73 was released. * tm-vm: Version 7.79 was released. + * tm-mail: Version 7.28 was released. * TM-MK (update-xemacs-source): Use `TL_DIR' as value of `EMU_DIR'. diff --git a/Makefile b/Makefile index 3d20b30..88840dc 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.104 +VERSION = 7.105 SHELL = /bin/sh MAKE = make diff --git a/tm-def.el b/tm-def.el index bd80377..332a9e7 100644 --- a/tm-def.el +++ b/tm-def.el @@ -1,9 +1,9 @@ ;;; tm-def.el --- definition module for tm -;; Copyright (C) 1995,1996 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: tm-def.el,v 7.69 1997/01/21 06:13:15 shuhei-k Exp $ +;; Version: $Id: tm-def.el,v 7.71 1997/02/13 14:29:53 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, definition ;; This file is part of tm (Tools for MIME). @@ -170,6 +170,46 @@ )) +;;; @ PGP +;;; + +(defvar pgp-function-alist + '( + ;; for tm-pgp + (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") + ;; for tm-edit + (mime-sign tm:mc-pgp-sign-region "tm-edit-mc") + (traditional-sign mc-pgp-sign-region "mc-pgp") + (encrypt tm:mc-pgp-encrypt-region "tm-edit-mc") + (insert-key mc-insert-public-key "mc-toplev") + ) + "Alist of service names vs. corresponding functions and its filenames. +Each element looks like (SERVICE FUNCTION FILE). + +SERVICE is a symbol of PGP processing. It allows `verify', `decrypt', +`fetch-key', `snarf-keys', `mime-sign', `traditional-sign', `encrypt' +or `insert-key'. + +Function is a symbol of function to do specified SERVICE. + +FILE is string of filename which has definition of corresponding +FUNCTION.") + +(defmacro pgp-function (method) + "Return function to do service METHOD." + (` (car (cdr (assq (, method) (symbol-value 'pgp-function-alist))))) + ) + +(mapcar (function + (lambda (method) + (autoload (second method)(third method)) + )) + pgp-function-alist) + + ;;; @ definitions about MIME ;;; diff --git a/tm-edit.el b/tm-edit.el index 702d74d..3ac3aff 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.104 $ +;; Version: $Revision: 7.105 $ ;; 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.104 1997/02/10 05:49:00 morioka Exp $") + "$Id: tm-edit.el,v 7.105 1997/02/13 14:29:14 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -433,16 +433,6 @@ If it is not specified for a major-mode, (defvar mime-editor/encrypting-type 'pgp-elkins "*PGP encrypting type (pgp-elkins, pgp-kazu or nil). [tm-edit.el]") -(defvar mime-editor/pgp-sign-function 'tm:mc-pgp-sign-region) -(defvar mime-editor/pgp-encrypt-function 'tm:mc-pgp-encrypt-region) -(defvar mime-editor/traditional-pgp-sign-function 'mc-pgp-sign-region) -(defvar mime-editor/pgp-insert-public-key-function 'mc-insert-public-key) - -(autoload mime-editor/pgp-sign-function "tm-edit-mc") -(autoload mime-editor/pgp-encrypt-function "tm-edit-mc") -(autoload mime-editor/traditional-pgp-sign-function "mc-pgp") -(autoload mime-editor/pgp-insert-public-key-function "mc-toplev") - ;;; @@ about tag ;;; @@ -880,7 +870,7 @@ just return to previous mode." (defun mime-editor/insert-text () "Insert a text message. -Charset is automatically obtained from the `mime/lc-charset-alist'." +Charset is automatically obtained from the `charsets-mime-charset-alist'." (interactive) (let ((ret (mime-editor/insert-tag "text" nil nil))) (if ret @@ -1558,7 +1548,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (insert (format "Content-Transfer-Encoding: %s\n" encoding)) ) (insert "\n") - (or (funcall mime-editor/pgp-sign-function + (or (funcall (pgp-function 'mime-sign) (point-min)(point-max) nil nil pgp-boundary) (throw 'mime-editor/error 'pgp-error) ) @@ -1622,7 +1612,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (insert (format "Content-Transfer-Encoding: %s\n" encoding)) ) (insert "\n") - (or (funcall mime-editor/pgp-encrypt-function + (or (funcall (pgp-function 'encrypt) recipients (point-min) (point-max) from) (throw 'mime-editor/error 'pgp-error) ) @@ -1659,7 +1649,7 @@ Content-Transfer-Encoding: 7bit ) (insert "\n") (or (as-binary-process - (funcall mime-editor/traditional-pgp-sign-function + (funcall (pgp-function 'traditional-sign) beg (point-max))) (throw 'mime-editor/error 'pgp-error) ) @@ -1693,7 +1683,7 @@ Content-Transfer-Encoding: 7bit ) (insert "\n") (or (as-binary-process - (funcall mime-editor/pgp-encrypt-function + (funcall (pgp-function 'encrypt) recipients beg (point-max) nil 'maybe) ) (throw 'mime-editor/error 'pgp-error) @@ -2074,7 +2064,7 @@ and insert data encoded as ENCODING. [tm-edit.el]" (interactive "P") (mime-editor/insert-tag "application" "pgp-keys") (mime-editor/define-encoding "7bit") - (funcall mime-editor/pgp-insert-public-key-function) + (funcall (pgp-function 'insert-key)) ) diff --git a/tm-image.el b/tm-image.el index bde37a3..80dd34b 100644 --- a/tm-image.el +++ b/tm-image.el @@ -7,7 +7,7 @@ ;; Dan Rich ;; Maintainer: MORIOKA Tomohiko ;; Created: 1995/12/15 -;; Version: $Id: tm-image.el,v 7.27 1997/02/10 16:16:21 morioka Exp $ +;; Version: $Id: tm-image.el,v 7.28 1997/02/13 04:39:19 morioka Exp $ ;; Keywords: image, picture, X-Face, MIME, multimedia, mail, news @@ -90,8 +90,10 @@ ;; ;; X-Face ;; - (add-hook 'mime-viewer/content-header-filter-hook - 'x-face-decode-message-header) + (if (file-installed-p uncompface-program exec-path) + (add-hook 'mime-viewer/content-header-filter-hook + 'x-face-decode-message-header) + ) )) (or (fboundp 'image-invalid-glyph-p) diff --git a/tm-pgp.el b/tm-pgp.el index 3b439fd..d6c198a 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.30 1997/02/11 08:57:58 morioka Exp $ +;; Version: $Id: tm-pgp.el,v 7.33 1997/02/13 14:51:04 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, PGP, security ;; This file is part of tm (Tools for MIME). @@ -42,23 +42,6 @@ (require 'tm-play) -(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") - )) - -(defsubst pgp-function (method) - (car (cdr (assq method pgp-function-alist))) - ) - -(mapcar (function - (lambda (method) - (autoload (second method)(third method)) - )) - pgp-function-alist) - ;;; @ internal method for application/pgp ;;; @@ -67,13 +50,15 @@ (defun mime-article/view-application/pgp (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) (cur-buf (current-buffer)) + (p-win (or (get-buffer-window mime::article/preview-buffer) + (get-largest-window))) (new-name (format "%s-%s" (buffer-name) cnum)) (mother mime::article/preview-buffer) (mode major-mode) code-converter (str (buffer-substring beg end)) ) - (switch-to-buffer new-name) + (set-buffer (get-buffer-create new-name)) (erase-buffer) (insert str) (cond ((progn @@ -116,7 +101,8 @@ )) (setq major-mode 'mime/show-message-mode) (setq mime::article/code-converter code-converter) - (mime/viewer-mode mother) + (save-window-excursion (mime/viewer-mode mother)) + (set-window-buffer p-win mime::article/preview-buffer) )) (set-atype 'mime/content-decoding-condition -- 1.7.10.4