+1997-02-13 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * 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 <morioka@jaist.ac.jp>
+
+ * 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.
+
+\f
1997-02-12 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* emu: Version 7.37.7 was released.
* 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'.
# $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
;;; 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 <morioka@jaist.ac.jp>
-;; 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).
))
+;;; @ 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
;;;
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; 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).
;;;
(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))
(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
;;;
(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
(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)
)
(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)
)
)
(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)
)
)
(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)
(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))
)
;; Dan Rich <drich@morpheus.corp.sgi.com>
;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; 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
;;
;; 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)
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; 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).
(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
;;;
(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
))
(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
projects / elisp / tm.git / commitdiff