Merge commit 'faf966b6b5921074da6b99477e1f0bea29b45f6f'

[gnu-emacs-elpa] / packages / gnorb / gnorb-gnus.el

diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index a77a7ed5319661e0e0725ec099ddfb30322e8085..e425ca2ffd9f56f5a88afd87f780abf7f5964956 100644 (file)
--- 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)