[elpa] externals/gnorb 9ecb0e2 136/449: Use BBDB posting styles in mail composition

[Stefan Monnier]

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

    Use BBDB posting styles in mail composition
    
    lisp/gnorb-org.el: (gnorb-org-handle-mail, gnorb-org-email-subtree)
                   Change both functions to make use of
                   gnorb-bbdb-posting-styles. When will these
                   functions get merged!?
---
 lisp/gnorb-org.el | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/lisp/gnorb-org.el b/lisp/gnorb-org.el
index 3c5d8f2..84f4b9e 100644
--- a/lisp/gnorb-org.el
+++ b/lisp/gnorb-org.el
@@ -523,10 +523,17 @@ current heading."
               (cc (mp "MAIL_CC"))
               (bcc (mp "MAIL_BCC"))
               (org-id (org-id-get-create))
+              (recs (plist-get links :bbdb))
               mails)
-         (when (plist-get links :bbdb)
-           (dolist (b (plist-get links :bbdb))
-             (push (gnorb-bbdb-link-to-mail b) mails)))
+         (when recs
+           (dolist (r recs)
+             (push (gnorb-bbdb-link-to-mail r) mails)))
+         (when (and gnorb-bbdb-posting-styles
+                    recs)
+           (add-hook 'message-mode-hook
+                     (lambda ()
+                       (gnorb-bbdb-configure-posting-styles (cdr recs))
+                       (gnorb-bbdb-configure-posting-styles (list (car 
recs))))))
          (gnorb-org-setup-message
           (plist-get links :gnus) ; gnus links
           (append mails (plist-get links :mail))
@@ -694,21 +701,28 @@ default set of parameters."
         (links (gnorb-org-extract-mail-stuff strategy))
         (attachments (gnorb-org-attachment-list))
         (org-id (org-id-get-create))
-        text mails)
+        (recs (plist-get links :bbdb))
+        text mails )
     ;; this should just go into a call to `org-handle-mail', passing
     ;; the results of the export as an argument
     (setq gnorb-org-window-conf (current-window-configuration))
     (if (bufferp result)
        (setq text result)
       (push result attachments))
-    (when (plist-get links :bbdb)
-           (dolist (b (plist-get links :bbdb))
-             (push (gnorb-bbdb-link-to-mail b) mails)))
+    (when recs
+      (dolist (r recs)
+       (push (gnorb-bbdb-link-to-mail r) mails)))
+    (when (and gnorb-bbdb-posting-styles
+              recs)
+      (add-hook 'message-mode-hook
+               (lambda ()
+                 (gnorb-bbdb-configure-posting-styles (cdr recs))
+                 (gnorb-bbdb-configure-posting-styles (list (car recs))))))
     (gnorb-org-setup-message
      (plist-get links :gnus)
      (append mails (plist-get links :mails))
      nil nil nil ;; when this calls into `org-handle-mail' all this
-                ;; will be sorted
+     ;; will be sorted
      attachments text org-id)))
 
 (defcustom gnorb-org-capture-collect-link-p t