From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 5E7A76DE0F2E for ; Sat, 30 Mar 2019 14:48:40 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -2.678 X-Spam-Level: X-Spam-Status: No, score=-2.678 tagged_above=-999 required=5 tests=[AWL=-0.176, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jywnM-tt4Gi9 for ; Sat, 30 Mar 2019 14:48:39 -0700 (PDT) Received: from smtp-4.sys.kth.se (smtp-4.sys.kth.se [130.237.48.193]) by arlo.cworth.org (Postfix) with ESMTPS id 799B86DE11A0 for ; Sat, 30 Mar 2019 14:48:38 -0700 (PDT) Received: from smtp-4.sys.kth.se (localhost.localdomain [127.0.0.1]) by smtp-4.sys.kth.se (Postfix) with ESMTP id 16B902941 for ; Sat, 30 Mar 2019 22:48:37 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-4.sys.kth.se ([127.0.0.1]) by smtp-4.sys.kth.se (smtp-4.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id CjFDA_r82-ix; Sat, 30 Mar 2019 22:48:36 +0100 (CET) X-KTH-Auth: ekeberg [85.229.204.229] DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kth.se; s=default; t=1553982516; bh=vajbzuVbTQpXE7tQXBGtUvxfkzpJPUgT6Bcug9C7nRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d6WGrIa0fso6nDDq/3U9m5GdGsfACgAjN/V/ozk8thinspRDWIx22VLuH/EHomci7 OZoy4N9DhksxHx1jCIN1MNFUKtnAXCgsGiIEPiIco6ZaT8XNjlruLaYL4uBG91uQhA MvLYzWv2Rt0CWCqf0MpPqOvV/qfGk3SZNDbDJiyA= X-KTH-mail-from: ekeberg@kth.se Received: from swing.localdomain (c-e5cce555.09-723-73746f39.bbcust.telenor.se [85.229.204.229]) by smtp-4.sys.kth.se (Postfix) with ESMTPSA id 572DC1DF; Sat, 30 Mar 2019 22:48:36 +0100 (CET) From: =?UTF-8?q?=C3=96rjan=20Ekeberg?= To: notmuch@notmuchmail.org Subject: [PATCH 2/2] emacs: Tag forwarded messages with +forwarded (customizable) Date: Sat, 30 Mar 2019 22:48:21 +0100 Message-Id: <20190330214821.4150-3-ekeberg@kth.se> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330214821.4150-1-ekeberg@kth.se> References: <20190330214821.4150-1-ekeberg@kth.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Mar 2019 21:48:40 -0000 Use the buffer-local variable notmuch-message-queued-tag-changes to change tags when the forwarding message is sent. --- emacs/notmuch-message.el | 13 +++++++++++++ emacs/notmuch-mua.el | 21 ++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el index 513bbe66..f6466de8 100644 --- a/emacs/notmuch-message.el +++ b/emacs/notmuch-message.el @@ -38,6 +38,19 @@ the \"inbox\" and \"todo\" tags, you would set: :type '(repeat string) :group 'notmuch-send) +(defcustom notmuch-message-forwarded-tags '("+forwarded") + "List of tag changes to apply to a message when it has been forwarded. + +Tags starting with \"+\" (or not starting with either \"+\" or +\"-\") in the list will be added, and tags starting with \"-\" +will be removed from the message being forwarded. + +For example, if you wanted to add a \"forwarded\" tag and remove +the \"inbox\" tag, you would set: + (\"+forwarded\" \"-inbox\")" + :type '(repeat string) + :group 'notmuch-send) + ;; This function is not used by default, but kept for backward compatibility (defun notmuch-message-mark-replied () ;; get the in-reply-to header and parse it for the message id. diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index b23a8c2d..4030399e 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -477,7 +477,8 @@ the From: address." (list (cons 'From (notmuch-mua-prompt-for-sender))))) forward-subject ;; Comes from the first message and is ;; applied later. - forward-references) ;; Accumulated message-ids of forwarded messages + forward-references ;; List of accumulated message-references of forwarded messages + forward-queries) ;; List of corresponding message-query ;; Generate the template for the outgoing message. (notmuch-mua-mail nil "" other-headers nil (notmuch-mua-get-switch-function)) @@ -496,11 +497,8 @@ the From: address." ;; always generate a forwarded subject, then use the ;; last (i.e. first) one. (setq forward-subject (message-make-forward-subject)) - (if forward-references - (setq forward-references - (concat forward-references ", " - (message-fetch-field "Message-ID"))) - (setq forward-references (message-fetch-field "Message-ID")))) + (push (message-fetch-field "Message-ID") forward-references) + (push id forward-queries)) ;; Make a copy ready to be forwarded in the ;; composition buffer. (message-forward-make-body temp-buffer) @@ -516,7 +514,16 @@ the From: address." (message-remove-header "Subject") (message-add-header (concat "Subject: " forward-subject)) (message-remove-header "References") - (message-add-header (concat "References: " forward-references))) + (message-add-header (concat "References: " + (mapconcat 'identity forward-references ", ")))) + + ;; Create a buffer-local queue for tag changes triggered when sending the message + (when notmuch-message-forwarded-tags + (setq-local notmuch-message-queued-tag-changes + (loop for id in forward-queries + collect + (cons id + notmuch-message-forwarded-tags)))) ;; `message-forward-make-body' shows the User-agent header. Hide ;; it again. -- 2.20.1