[elpa] master 510f0ff 2/2: Merge commit 'faf966b6b5921074da6b99477e1f0bea29b45f6f'

[Eric Abrahamsen]

branch: master
commit 510f0ff8885932ebd0322b8f5bc4efc943be512e
Merge: 34753b4 faf966b
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Merge commit 'faf966b6b5921074da6b99477e1f0bea29b45f6f'
---
 packages/gnorb/gnorb-gnus.el |    7 +++----
 packages/gnorb/gnorb-org.el  |    2 +-
 packages/gnorb/gnorb.el      |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index a77a7ed..e425ca2 100644
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@ -309,10 +309,7 @@ information about the outgoing message into
                         'gnorb-org-restore-after-send t))
        (setq gnorb-message-org-ids nil)))))
 
-;; This sets the global value, but the hook is made buffer-local in
-;; `gnus-inews-add-send-actions', so this is ignored
-;(add-hook 'message-header-hook 'gnorb-gnus-check-outgoing-headers)
-(add-hook 'message-send-hook 'gnorb-gnus-check-outgoing-headers t)
+(add-hook 'message-sent-hook 'gnorb-gnus-check-outgoing-headers t)
 
 ;;;###autoload
 (defun gnorb-gnus-outgoing-do-todo (&optional arg)
@@ -628,6 +625,8 @@ reply."
         (targ (car-safe related-headings)))
     (if targ
        (let ((ret (make-marker)))
+         (setq gnorb-window-conf (current-window-configuration))
+         (move-marker gnorb-return-marker (point))
          ;; Assume the first heading is the one we want.
          (gnorb-registry-make-entry
           msg-id from subject targ group)
diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index 3392111..78d636b 100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -164,7 +164,7 @@ we came from."
                 :raw-value
                 head)
                strings)
-         (org-element-map tree 'paragraph
+         (org-element-map tree '(paragraph drawer)
            (lambda (p)
              (push (org-element-interpret-data p)
                    strings))
diff --git a/packages/gnorb/gnorb.el b/packages/gnorb/gnorb.el
index ead6ac3..d2800f0 100644
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2014  Free Software Foundation, Inc.
 
-;; Version: 1.1.0
+;; Version: 1.1.1
 ;; Package-Requires: ((cl-lib "0.5"))
 
 ;; Maintainer: Eric Abrahamsen <address@hidden>