[elpa] externals/gnorb e44ece6 102/449: Multiple misnamed variables in bbdb posting styles

[Stefan Monnier]

branch: externals/gnorb
commit e44ece68389ac46483effa6851e8b2f6d887aae8
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Multiple misnamed variables in bbdb posting styles
    
    lisp:/gnorb-bbdb.el: gnorb-bbdb-configure-posting-styles was a mess of
                     undeclared variables -- bad copy & paste, possibly
                     due to drunkenness.
---
 lisp/gnorb-bbdb.el | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lisp/gnorb-bbdb.el b/lisp/gnorb-bbdb.el
index 370a4ad..27a87d7 100644
--- a/lisp/gnorb-bbdb.el
+++ b/lisp/gnorb-bbdb.el
@@ -115,34 +115,37 @@ If VERBOSE is non-nil (as in interactive calls) be 
verbose."
 (defun gnorb-bbdb-configure-posting-styles (recs)
   ;; My most magnificent work of copy pasta!
   (dolist (r recs)
-    (let (field val label recval element filep
-               element v results name address)
+    (let (field val label rec-val element filep
+               element v value results name address)
       (dolist (style gnorb-bbdb-posting-styles)
        (setq field (pop style)
              val (pop style))
-       (when (consp val)
+       (when (consp val) ;; (label value)
          (setq label (pop val)
                val (pop val)))
        (unless (fboundp field)
+         ;; what's the record's existing value for this field?
          (setq rec-val (bbdb-record-field r field)))
        (when (cond
               ((eq field 'address)
                (dolist (a rec-val)
                  (unless (and label
-                              (not (string-match label (car f))))
-                   (string-match val (bbdb-format-address-default f)))))
+                              (not (string-match label (car a))))
+                   (string-match val (bbdb-format-address-default a)))))
               ((eq field 'phone)
                (dolist (p rec-val)
                  (unless (and label
-                              (not (string-match label (car f))))
+                              (not (string-match label (car p))))
                    (string-match val (bbdb-phone-string p)))))
               ((consp rec-val)
                (dolist (f rec-val)
-                 (string-match var f)))
+                 (string-match val f)))
               ((fboundp field)
-               (funcall field rec))
+               (funcall field r))
               ((stringp rec-val)
                (string-match val rec-val)))
+         ;; there are matches, run through the field setters in last
+         ;; element of the sexp
          (dolist (attribute style)
            (setq element (pop attribute)
                  filep nil)
@@ -159,10 +162,7 @@ If VERBOSE is non-nil (as in interactive calls) be 
verbose."
            (setq v
                  (cond
                   ((stringp value)
-                   (if (and (gnus-string-match-p "\\\\[&[:digit:]]" value)
-                            (match-beginning 1))
-                       (gnus-match-substitute-replacement value nil nil group)
-                     value))
+                   value)
                   ((or (symbolp value)
                        (functionp value))
                    (cond ((functionp value)