Bugfix: Prompting for creation now works again as documented.

Thanks to Leo for reporting this.

Also did some docstring fixes.

4 files changed, 9 insertions, 10 deletions

diff --git a/lisp/bbdb-com.el b/lisp/bbdb-com.el
index b0e1098..6e4c7f7 100644
--- a/lisp/bbdb-com.el
+++ b/lisp/bbdb-com.el
@@ -3507,7 +3507,7 @@ creating or modifying them as necessary.  A record will be created if
 AUTO-CREATE-P is non-nil or if OFFER-TO-CREATE is true and the user
 confirms the creation.
 
-`bbdb-update-records-mode' controls if records are upodated or not.
+`bbdb-update-records-mode' controls if records are updated or not.
 A MUA specific variable, e.g. `bbdb/vm-update-records-mode', can
 overwrite this.
 
@@ -3549,9 +3549,11 @@ C-g again it will stop scanning."
 			 (list;; search might return a list
 			  (bbdb-annotate-message-sender
 			   bbdb-address t
-			   (or offer-to-create;; force create
-			       auto-create-p)
-			   'bbdb-prompt-for-create)))
+                           (or auto-create-p offer-to-create)
+                           (if auto-create-p
+                               nil
+                             (if offer-to-create
+                                 'bbdb-prompt-for-create)))))
 			((eq bbdb-update-records-mode 'searching)
 			 ;; search for records having this net
 			 (let ((net (concat "^"
diff --git a/lisp/bbdb-gnus.el b/lisp/bbdb-gnus.el
index 69f3c31..0ea33db 100644
--- a/lisp/bbdb-gnus.el
+++ b/lisp/bbdb-gnus.el
@@ -95,7 +95,7 @@ the user confirms the creation."
 (defun bbdb/gnus-update-records (&optional offer-to-create)
   "Return the records corresponding to the current Gnus message, creating
 or modifying it as necessary.  A record will be created if
-bbdb/news-auto-create-p is non-nil or if OFFER-TO-CREATE is true
+`bbdb/news-auto-create-p' is non-nil or if OFFER-TO-CREATE is true
 and the user confirms the creation.
 
 The variable `bbdb/gnus-update-records-mode' controls what actions
diff --git a/lisp/bbdb-vm.el b/lisp/bbdb-vm.el
index 3d5e93b..9ef279a 100644
--- a/lisp/bbdb-vm.el
+++ b/lisp/bbdb-vm.el
@@ -69,7 +69,7 @@ The default is to annotate only new messages."
 (defun bbdb/vm-update-records (&optional offer-to-create)
   "Returns the records corresponding to the current VM message,
 creating or modifying them as necessary.  A record will be created if
-bbdb/mail-auto-create-p is non-nil or if OFFER-TO-CREATE is true, and
+`bbdb/mail-auto-create-p' is non-nil or if OFFER-TO-CREATE is true, and
 the user confirms the creation.
 
 The variable `bbdb/vm-update-records-mode' controls what actions
diff --git a/lisp/bbdb.el b/lisp/bbdb.el
index 631a48c..296cf4e 100644
--- a/lisp/bbdb.el
+++ b/lisp/bbdb.el
@@ -448,10 +448,8 @@ commands be different."
   :group 'bbdb
   :type 'boolean)
 
-;; these variables both need to be enabled for gnus mailreading to
-;; work right. that's probably a bug, or something.
 (defcustom bbdb/mail-auto-create-p t
-  "*If this is t, then Gnus, MH, RMAIL, and VM will automatically
+  "*If this is t, then MH, RMAIL, and VM will automatically
 create new bbdb records for people you receive mail from. If this
 is a function name or lambda, then it is called with no arguments
 to decide whether an entry should be automatically created. You
@@ -3314,7 +3312,6 @@ before the record is created, otherwise it is created without confirmation
             (if (string-match "^[^@]+" net)
                 (setq name (bbdb-clean-username (match-string 0 net)))))
         (setq record (if (or (null prompt-to-create-p)
-                             (eq create-p t) ;; don't skip if it's 'prompt!
                              (if (functionp prompt-to-create-p)
                                  (bbdb-invoke-hook-for-value
                                   prompt-to-create-p)