Sync up with the latest semi-1_13 branch.

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

diff --git a/semi-def.el b/semi-def.el
index c787878..4292f0c 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -1,8 +1,8 @@
-;;; semi-def.el --- definition module for SEMI
+;;; semi-def.el --- definition module for SEMI -*- coding: iso-8859-4; -*-
 
 ;; Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: definition, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (Sample of Emacs MIME Implementation).
@@ -30,7 +30,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["SEMI" (1 13 3) "Komaiko"]
+(defconst mime-user-interface-product ["REMI" (1 13 2) "Òike-Ikoinomori"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
@@ -168,18 +168,30 @@
 ;;; @ PGP
 ;;;
 
+(defcustom pgp-version 'pgp
+  "Version of PGP or GnuPG command to be used for encryption or sign.
+The value should be a symbol.  Allowed versions are:
+
+  gpg   - GnuPG.
+  pgp50 - PGP version 5.0i.
+  pgp   - PGP version 2.6."
+  :group 'mime
+  :type '(radio (choice-item :tag "GnuPG" gpg)
+               (choice-item :tag "PGP 5.0i" pgp50)
+               (choice-item :tag "PGP 2.6" pgp)))
+
 (defvar pgp-function-alist
   '(
     ;; for mime-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")
+    (verify            mime-mc-verify                  "mime-mc")
+    (decrypt           mime-mc-decrypt                 "mime-mc")
+    (fetch-key         mime-mc-fetch-key               "mime-mc")
+    (snarf-keys                mime-mc-snarf-keys              "mime-mc")
     ;; for mime-edit
-    (mime-sign         mime-mc-pgp-sign-region         "mime-mc")
-    (traditional-sign  mc-pgp-sign-region              "mc-pgp")
-    (encrypt           mime-mc-pgp-encrypt-region      "mime-mc")
-    (insert-key                mc-insert-public-key            "mc-toplev")
+    (mime-sign         mime-mc-sign-region             "mime-mc")
+    (traditional-sign  mime-mc-traditional-sign-region "mime-mc")
+    (encrypt           mime-mc-encrypt-region          "mime-mc")
+    (insert-key                mime-mc-insert-public-key       "mime-mc")
     )
   "Alist of service names vs. corresponding functions and its filenames.
 Each element looks like (SERVICE FUNCTION FILE).