(bbdb-extract-field-value): Use `eword-decode-string' instead of

[elisp/tm.git] / tm-def.el

diff --git a/tm-def.el b/tm-def.el
index 6d920e3..3686df9 100644 (file)
--- 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.63 1996/09/05 09:08:31 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).
@@ -19,14 +19,13 @@
 ;; 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 Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
 (require 'emu)
-(require 'tl-822)
 
 
 ;;; @ variables
@@ -105,19 +104,26 @@
     (tl:overlay-put overlay 'face face)
     ))
 
-(setq tm:button-face 'bold)
-(setq tm:mouse-face 'highlight)
+(defvar tm:button-face 'bold
+  "Face used for content-button or URL-button of MIME-Preview buffer.
+\[tm-def.el]")
+
+(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)
@@ -164,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
 ;;;
 
@@ -173,10 +219,6 @@
 
 (defconst mime/content-type-subtype-regexp
   (concat mime/token-regexp "/" mime/token-regexp))
-(defconst mime/content-parameter-value-regexp
-  (concat "\\("
-         rfc822/quoted-string-regexp
-         "\\|[^; \t\n]*\\)"))
 
 (defconst mime/disposition-type-regexp mime/token-regexp)
 
@@ -184,15 +226,22 @@
 ;;; @@ 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
-  (concat "\\("
+  (concat "\\(\\("
+         base64-token-regexp
          base64-token-regexp
          base64-token-regexp
          base64-token-regexp
+         "\\)*"
          base64-token-regexp
-         "\\)+"))
+         base64-token-regexp
+         base64-token-padding-regexp
+         base64-token-padding-regexp
+          "\\)"))
+
 (defconst mime/B-encoding-and-encoded-text-regexp
   (concat "\\(B\\)\\?" mime/B-encoded-text-regexp))