branch: master
commit 96c83ef907dec53c96d48aa91cfe6de2390ca8ac
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Fix to after capture function, bump to 1.3.4
* packages/gnorb/gnorb-gnus.el (gnorb-gnus-after-capture-function):
The order was incorrect, the attachment stuff needs to happen in the
capture buffer, the rest of it in the Gnus buffer.
* packages/gnorb/gnorb.el: Flush changes.
---
packages/gnorb/gnorb-gnus.el | 29 +++++++++++++++--------------
packages/gnorb/gnorb.el | 2 +-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index dfef37a..df50bb2 100644
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@ -259,6 +259,21 @@ captured from onto the Org heading being captured.
(when (with-current-buffer
(org-capture-get :original-buffer)
(memq major-mode '(gnus-summary-mode gnus-article-mode)))
+ ;; This part needs to happen in the capture buffer.
+ (when (or gnorb-gnus-capture-always-attach
+ (org-capture-get :gnus-attachments))
+ (require 'org-attach)
+ (setq gnorb-gnus-capture-attachments nil)
+ (gnorb-gnus-collect-all-attachments t)
+ (map-y-or-n-p
+ (lambda (a)
+ (format "Attach %s to capture heading? "
+ (file-name-nondirectory a)))
+ (lambda (a) (org-attach-attach a nil 'mv))
+ gnorb-gnus-capture-attachments
+ '("file" "files" "attach"))
+ (setq gnorb-gnus-capture-attachments nil))
+ ;; This part happens in the original summary/article buffer.
(save-window-excursion
(set-buffer (org-capture-get :original-buffer))
(let ((art-no (gnus-summary-article-number)))
@@ -276,20 +291,6 @@ captured from onto the Org heading being captured.
(kill-new (buffer-substring (point) (point-max)))
(message "Message text copied to kill ring"))))
- (when (or gnorb-gnus-capture-always-attach
- (org-capture-get :gnus-attachments))
- (require 'org-attach)
- (setq gnorb-gnus-capture-attachments nil)
- (gnorb-gnus-collect-all-attachments t)
- (map-y-or-n-p
- (lambda (a)
- (format "Attach %s to capture heading? "
- (file-name-nondirectory a)))
- (lambda (a) (org-attach-attach a nil 'mv))
- gnorb-gnus-capture-attachments
- '("file" "files" "attach"))
- (setq gnorb-gnus-capture-attachments nil))
-
(when gnorb-gnus-tick-all-tracked-messages
(gnus-summary-mark-article art-no gnus-ticked-mark))
diff --git a/packages/gnorb/gnorb.el b/packages/gnorb/gnorb.el
index e022083..066008c 100644
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2014 Free Software Foundation, Inc.
-;; Version: 1.3.3
+;; Version: 1.3.4
;; Package-Requires: ((cl-lib "0.5"))
;; Maintainer: Eric Abrahamsen <e...@ericabrahamsen.net>
