[elpa] externals/gnorb a509ff6 164/449: Still trying to track outgoing messages

[Stefan Monnier]

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

    Still trying to track outgoing messages
    
    * lisp/gnorb-gnus.el (gnorb-gnus-check-outgoing-headers): Instead of
      relying on blanking out `gnorb-gnus-sending-message-info' when we're
      done with it, just blank it out before we use it.
    (gnorb-gnus-outgoing-make-todo-1): Don't set it to nil
    
    * lisp/gnorb-org.el (gnorb-org-add-id-hash-entry): If we're in capture,
      we need the base buffer.
---
 lisp/gnorb-gnus.el | 6 ++----
 lisp/gnorb-org.el  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lisp/gnorb-gnus.el b/lisp/gnorb-gnus.el
index f9b92f6..54ee920 100644
--- a/lisp/gnorb-gnus.el
+++ b/lisp/gnorb-gnus.el
@@ -251,6 +251,7 @@ information about the outgoing message into
 `gnorb-gnus-sending-message-info'."
   (save-restriction
     (message-narrow-to-headers)
+    (setq gnorb-gnus-sending-message-info nil)
     (let* ((org-ids (mail-fetch-field gnorb-mail-header nil nil t))
           (msg-id (mail-fetch-field "Message-ID"))
           (refs (mail-fetch-field "References"))
@@ -454,10 +455,7 @@ work."
     (org-capture nil gnorb-gnus-new-todo-capture-key)
     (when msg-id
       (org-entry-put (point) gnorb-org-msg-id-key msg-id)
-      (gnorb-org-add-id-hash-entry msg-id))
-    ;; It would be better to only do this if we knew the capture went
-    ;; through, ie wasn't aborted.
-    (setq gnorb-gnus-sending-message-info nil)))
+      (gnorb-org-add-id-hash-entry msg-id))))
 
 ;;; If an incoming message should trigger state-change for a Org todo,
 ;;; call this function on it.
diff --git a/lisp/gnorb-org.el b/lisp/gnorb-org.el
index 585140a..0568d3c 100644
--- a/lisp/gnorb-org.el
+++ b/lisp/gnorb-org.el
@@ -568,7 +568,7 @@ current heading."
                     (list
                      (file-name-nondirectory
                       (buffer-file-name
-                       (current-buffer))))
+                       (org-base-buffer (current-buffer)))))
                     (org-get-outline-path)
                     (list
                      (org-no-properties