* mime-image.el (mime-image-insert): Synch with the latest image.el.

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

diff --git a/pgg-def.el b/pgg-def.el
index 8473f43..1227996 100644 (file)
--- a/pgg-def.el
+++ b/pgg-def.el
@@ -32,20 +32,32 @@
   :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)
 
-(defcustom pgg-default-keyserver-address "pgp.nic.ad.jp"
+(defcustom pgg-default-keyserver-address "wwwkeys.pgp.net"
   "Host name of keyserver."
   :group 'pgg
   :type 'string)
 
+(defcustom pgg-encrypt-for-me nil
+  "If t, encrypt all outgoing messages with user's public key."
+  :group 'pgg
+  :type 'boolean)
+
+(defcustom pgg-cache-passphrase t
+  "If t, cache passphrase."
+  :group 'pgg
+  :type 'boolean)
+
 (defvar pgg-status-buffer " *PGG status*")
 (defvar pgg-errors-buffer " *PGG errors*")
 (defvar pgg-output-buffer " *PGG output*")
@@ -53,7 +65,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))