2002-10-20 Steve Youngs <youngs@xemacs.org>

	* pgg-parse.el (pgg-parse-public-key-algorithm-alist): XEmacs
	doesn't have the 'alist custom type, use cons cells instead.
	(pgg-parse-symmetric-key-algorithm-alist): Ditto.
	(pgg-parse-hash-algorithm-alist): Ditto.
	(pgg-parse-compression-algorithm-alist): Ditto.
	(pgg-parse-signature-type-alist): Ditto.

	* pgg-gpg.el (pgg-gpg-extra-args): Fix custom mismatch.

	* pgg-pgp5.el (pgg-pgp5-extra-args): Ditto.

	* pgg-pgp.el (pgg-pgp-extra-args): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01fa94c..e1de796 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-20  Steve Youngs  <youngs@xemacs.org>
+
+       * pgg-parse.el (pgg-parse-public-key-algorithm-alist): XEmacs
+       doesn't have the 'alist custom type, use cons cells instead.
+       (pgg-parse-symmetric-key-algorithm-alist): Ditto.
+       (pgg-parse-hash-algorithm-alist): Ditto.
+       (pgg-parse-compression-algorithm-alist): Ditto.
+       (pgg-parse-signature-type-alist): Ditto.
+
+       * pgg-gpg.el (pgg-gpg-extra-args): Fix custom mismatch.
+
+       * pgg-pgp5.el (pgg-pgp5-extra-args): Ditto.
+
+       * pgg-pgp.el (pgg-pgp-extra-args): Ditto.
+
 2002-10-19  Simon Josefsson  <jas@extundo.com>
 
        * nnimap.el (nnimap-open-server): Check imap-state in IMAP server

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 16c7a47..bc88fd0 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -39,7 +39,9 @@
 (defcustom pgg-gpg-extra-args nil
   "Extra arguments for every GnuPG invocation."
   :group 'pgg-gpg
-  :type 'string)
+  :type '(choice
+         (const :tag "None" nil)
+         (string :tag "Arguments")))
 
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")

diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 31fec95..881c27e 100644 (file)
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -47,19 +47,22 @@
   '((1 . RSA) (2 . RSA-E) (3 . RSA-S) (16 . ELG-E) (17 . DSA) (20 . ELG))
   "Alist of the assigned number to the public key algorithm."
   :group 'pgg-parse
-  :type 'alist)
+  :type '(repeat 
+         (cons (sexp :tag "Number") (sexp :tag "Type"))))
 
 (defcustom pgg-parse-symmetric-key-algorithm-alist
   '((1 . IDEA) (2 . 3DES) (4 . CAST5) (5 . SAFER-SK128))
   "Alist of the assigned number to the simmetric key algorithm."
   :group 'pgg-parse
-  :type 'alist)
+  :type '(repeat 
+         (cons (sexp :tag "Number") (sexp :tag "Type"))))
 
 (defcustom pgg-parse-hash-algorithm-alist
   '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2))
   "Alist of the assigned number to the cryptographic hash algorithm."
   :group 'pgg-parse
-  :type 'alist)
+  :type '(repeat 
+         (cons (sexp :tag "Number") (sexp :tag "Type"))))
 
 (defcustom pgg-parse-compression-algorithm-alist
   '((0 . nil); Uncompressed
@@ -67,7 +70,8 @@
     (2 . ZLIB))
   "Alist of the assigned number to the compression algorithm."
   :group 'pgg-parse
-  :type 'alist)
+  :type '(repeat 
+         (cons (sexp :tag "Number") (sexp :tag "Type"))))
 
 (defcustom pgg-parse-signature-type-alist
   '((0 . "Signature of a binary document")
@@ -85,7 +89,8 @@
     (64 . "Timestamp signature."))
   "Alist of the assigned number to the signature type."
   :group 'pgg-parse
-  :type 'alist)
+  :type '(repeat 
+         (cons (sexp :tag "Number") (sexp :tag "Type"))))
 
 (defcustom pgg-ignore-packet-checksum t; XXX
   "If non-nil checksum of each ascii armored packet will be ignored."

diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 544fdff..4ac1b5d 100644 (file)
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -50,7 +50,9 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 (defcustom pgg-pgp-extra-args nil
   "Extra arguments for every PGP invocation."
   :group 'pgg-pgp
-  :type 'string)
+  :type '(choice
+         (const :tag "None" nil)
+         (string :tag "Arguments")))
 
 (defvar pgg-pgp-user-id nil
   "PGP ID of your default identity.")

diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el
index 9624836..fccd80b 100644 (file)
--- a/lisp/pgg-pgp5.el
+++ b/lisp/pgg-pgp5.el
@@ -65,7 +65,9 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 (defcustom pgg-pgp5-extra-args nil
   "Extra arguments for every PGP 5.* invocation."
   :group 'pgg-pgp5
-  :type 'string)
+  :type '(choice
+         (const :tag "None" nil)
+         (string :tag "Arguments")))
 
 (defvar pgg-pgp5-user-id nil
   "PGP 5.* ID of your default identity.")