* mime-view.el (mime-view-insert-fontified-text-content): Use

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

diff --git a/pgg-def.el b/pgg-def.el
index c8fef62..3a5508e 100644 (file)
--- a/pgg-def.el
+++ b/pgg-def.el
@@ -1,8 +1,8 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
-;; Copyright (C) 1999 Daiki Ueno
+;; Copyright (C) 1999 Free Software Foundation, Inc.
 
-;; Author: Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
 ;; Keywords: PGP, OpenPGP, GnuPG
 
@@ -25,37 +25,46 @@
 
 ;;; Code:
 
-(require 'pcustom)
+(require 'custom)
 
 (defgroup pgg ()
   "Glue for the various PGP implementations."
   :group 'mime)
 
 (defcustom pgg-default-scheme 'gpg
-  "Default PGP scheme"
-  :group 'symbol
-  :type 'string)
+  "Default PGP scheme."
+  :group 'pgg
+  :type '(choice (const :tag "GnuPG" gpg)
+                (const :tag "PGP 5" pgp5)
+                (const :tag "PGP" pgp)))
 
 (defcustom pgg-default-user-id (user-login-name)
   "User ID of your default identity."
   :group 'pgg
   :type 'string)
 
+(defvar pgg-overriding-user-id nil
+  "User ID temporally bound during the command consequent upon
+`pgg-universal-user-id-argument'.")
+
 (defcustom pgg-default-keyserver-address "wwwkeys.pgp.net"
   "Host name of keyserver."
   :group 'pgg
   :type 'string)
 
 (defcustom pgg-encrypt-for-me nil
-  "Encrypt all outgoing messages with user's public key."
+  "If t, encrypt all outgoing messages with user's public key."
   :group 'pgg
   :type 'boolean)
 
 (defcustom pgg-cache-passphrase t
-  "Cache passphrase"
+  "If t, cache passphrase."
   :group 'pgg
   :type 'boolean)
 
+(defvar pgg-messages-coding-system nil
+  "Coding system used when reading from a PGP external process.")
+
 (defvar pgg-status-buffer " *PGG status*")
 (defvar pgg-errors-buffer " *PGG errors*")
 (defvar pgg-output-buffer " *PGG output*")
@@ -63,7 +72,7 @@
 (defvar pgg-echo-buffer "*PGG-echo*")
 
 (defvar pgg-scheme nil
-  "Current scheme of PGP implementation")
+  "Current scheme of PGP implementation.")
 
 (defmacro pgg-truncate-key-identifier (key)
   `(if (> (length ,key) 8) (substring ,key 8) ,key))