*** empty log message ***

2 files changed, 61 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 296ffa3..2e5098d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-10-19  Steve Youngs  <youngs@xemacs.org>
+
+	* bits/bbdb-pgp.el
+	(bbdb-utilities-pgp): New.
+	(bbdb/pgp-field): defvar -> defcustom.
+	(bbdb/pgp-method): Ditto.
+	(bbdb/pgp-default-action): Ditto.
+
+2002-10-20  Waider  <waider@waider.ie>
+
+	* bits/bbdb-pgp.el:
+	Allow bbdb-pgp.el to be configured to use message.el MML tags to perform
+          the signing and encryption, instead of only plain Mailcrypt which is not
+          MIME-aware. (Michael Shields)
+
+2002-09-17  Waider  <waider@waider.ie>
+
+	* lisp/bbdb.el:
+	Treat bbdb-canonicalize-net-hook as an actual hook. Some prompting &
+	code from Micha Wiedenmann. NB documentation not yet updated.
+
+	* texinfo/bbdb.texinfo:
+	Added dircategory (Jochen Küpper)
+
 2002-08-19  Jim Blandy  <jimb@redhat.com>
 
 	* lisp/bbdb-com.el (bbdb-complete-name): Don't choke if the
diff --git a/bits/bbdb-pgp.el b/bits/bbdb-pgp.el
index b1673e7..215bef7 100644
--- a/bits/bbdb-pgp.el
+++ b/bits/bbdb-pgp.el
@@ -69,6 +69,9 @@
 
 ;;; Change log:
 ;; $Log$
+;; Revision 1.3  2002/10/20 18:03:42  waider
+;; *** empty log message ***
+;;
 ;; Revision 1.2  2002/10/18 10:54:34  waider
 ;; allows bbdb-pgp.el to be configured to use message.el MML tags to perform
 ;; the signing and encryption, instead of only plain Mailcrypt which is not
@@ -105,23 +108,50 @@
 
 Report bugs to: Kevin Davidson tkld@quadstone.com")
 
-(defvar bbdb/pgp-field 'pgp-mail
+;;;###autoload
+(defgroup bbdb-utilities-pgp nil
+  "Automatically sign and/or encrypt outgoing messages."
+  :link '(emacs-library-link :tag "Lisp Source File" "bbdb-pgp.el")
+  :group 'bbdb-utilities)
+
+
+(defcustom bbdb/pgp-field 'pgp-mail
   "*Field to use in BBDB to store PGP preferences.
+
 If this field's value in a record is \"encrypt\" then messages are
-encrypted. If it is \"sign\" then messages are signed.")
+encrypted. If it is \"sign\" then messages are signed."
+  :type 'symbol
+  :tag "BBDB Field"
+  :require 'bbdb
+  :group 'bbdb-utilities-pgp)
 
-(defvar bbdb/pgp-method 'mailcrypt
+(defcustom bbdb/pgp-method 'mailcrypt
   "*How to sign or encrypt messages.
+
 'mailcrypt     means use Mailcrypt.
 'mml-pgp       means add MML tags for Message to use old PGP format
 'mml-pgpmime   means add MML tags for Message to use PGP/MIME
-'mml-smime     means add MML tags for Message to use S/MIME")
-
-(defvar bbdb/pgp-default-action nil
+'mml-smime     means add MML tags for Message to use S/MIME"
+  :type '(choice
+	  (const :tag "Mailcrypt" mailcrypt :require 'mailcrypt)
+	  (const :tag "MML PGP" mml-pgp :require 'mml)
+	  (const :tag "MML PGP/MIME" mml-pgpmime :require 'mml)
+	  (const :tag "MML S/MIME" mml-smime :require 'mml))
+  :tag "Signing/Encryption Method"
+  :group 'bbdb-utilities-pgp)
+
+(defcustom bbdb/pgp-default-action nil
   "*Default action when sending a message and the recipient is not in BBDB.
+
 nil         means do nothing.
 'encrypt    means encrypt message.
-'sign       means sign message.")
+'sign       means sign message."
+  :type '(choice
+	  (const :tag "Do Nothing")
+	  (const :tag "Encrypt" encrypt)
+	  (const :tag "Sign" sign))
+  :tag "Default Action"
+  :group 'bbdb-utilities-pgp)
 
 (defun bbdb/pgp-get-pgp (name address)
   "Look up user NAME and ADDRESS in BBDB and return the PGP preference."