[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/gnorb babfa5c 393/449: Fix to after capture function, b
From: |
Stefan Monnier |
Subject: |
[elpa] externals/gnorb babfa5c 393/449: Fix to after capture function, bump to 1.3.4 |
Date: |
Fri, 27 Nov 2020 23:16:18 -0500 (EST) |
branch: externals/gnorb
commit babfa5c26614d59ef558d12a914b627b2cce6ed2
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
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.
---
gnorb-gnus.el | 29 +++++++++++++++--------------
gnorb.el | 2 +-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/gnorb-gnus.el b/gnorb-gnus.el
index dfef37a..df50bb2 100644
--- a/gnorb-gnus.el
+++ b/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/gnorb.el b/gnorb.el
index d6f247f..9b23748 100644
--- a/gnorb.el
+++ b/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 <eric@ericabrahamsen.net>
- [elpa] externals/gnorb a55b0c0 273/449: Make gnorb-ids precious earlier in registry setup, (continued)
- [elpa] externals/gnorb a55b0c0 273/449: Make gnorb-ids precious earlier in registry setup, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 3877b2d 275/449: Still didn't have incoming-do-todo logic right, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 94f6897 279/449: Don't use with-eval-after-load, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 3801ad7 280/449: Check both gnus version and emacs version., Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 8c333ee 281/449: Merge pull request #20 from totherme/master, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 8e705ea3 380/449: Sneakily add basic EBDB support to Gnorb, bump to 1.3.0, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 4b5a5a1 389/449: Gnorb: Tweak manual a bit, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 5672545 396/449: Gnorb: Typo, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 14ac82a 418/449: [gnorb] Use unwind-protect around the trigger process, bump to 1.5.4, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 471883d 394/449: Gnorb: Only add one registry-related hook to the Org capture process, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb babfa5c 393/449: Fix to after capture function, bump to 1.3.4,
Stefan Monnier <=
- [elpa] externals/gnorb a6916b6 402/449: Allow gnorb-msg-id-request-head to accept a "group" argument, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb a1c8f0e 417/449: [gnorb] Small gnorb-org bugs, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 034f10a 434/449: [gnorb] Use characterp, not numberp, for testing register key, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb e1dae56 430/449: [gnorb] Only output summary-line info if registry exists, bump, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb c3279d2 284/449: Fix tracking messages from virtual groups, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 41c6778 286/449: nngnorb should be a virtual server, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 6e6ee46 285/449: Zap another with-eval-after-load, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 09679fa 287/449: Misspelled function name, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb f585c03 290/449: condition-case the incoming trigger process, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 821a6b2 289/449: Allow bulk association of messages, Stefan Monnier, 2020/11/27