X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-def.el;h=3686df9023ee7cb428d8c63079c6c4be12a86bb3;hb=b77b17617ad6e2d752ffa07cc4232a54c6ebae81;hp=cae6e27eabf2878e7388d11133ed1e4052d17d7e;hpb=6382d53814e8e75340338775b628f5621abe82a9;p=elisp%2Ftm.git

diff --git a/tm-def.el b/tm-def.el
index cae6e27..3686df9 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 <morioka@jaist.ac.jp>
-;; Version: $Id: tm-def.el,v 7.67 1996/12/27 20:39:43 morioka Exp $
+;; Version: $Id: tm-def.el,v 7.72 1997/03/06 17:52:22 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, definition
 
 ;; This file is part of tm (Tools for MIME).
@@ -111,16 +111,19 @@
 (defvar tm:mouse-face 'highlight
   "Face used for MIME-preview buffer mouse highlighting. [tm-def.el]")
 
+(defvar tm:warning-face nil
+  "Face used for invalid encoded-word.")
+
 (defun tm:add-button (from to func &optional data)
   "Create a button between FROM and TO with callback FUNC and data DATA."
   (and tm:button-face
        (tl:overlay-put (tl:make-overlay from to) 'face tm:button-face))
-  (tl:add-text-properties from to
-			  (append (and tm:mouse-face
-				       (list 'mouse-face tm:mouse-face))
-				  (list 'tm-callback func)
-				  (and data (list 'tm-data data))
-				  ))
+  (add-text-properties from to
+		       (append (and tm:mouse-face
+				    (list 'mouse-face tm:mouse-face))
+			       (list 'tm-callback func)
+			       (and data (list 'tm-data data))
+			       ))
   )
 
 (defvar tm:mother-button-dispatcher nil)
@@ -167,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
 ;;;
 
@@ -183,7 +226,7 @@
 ;;; @@ Base64
 ;;;
 
-(defconst base64-token-regexp "[A-Za-z0-9+/=]")
+(defconst base64-token-regexp "[A-Za-z0-9+/]")
 (defconst base64-token-padding-regexp "[A-Za-z0-9+/=]")
 
 (defconst mime/B-encoded-text-regexp