From b4ba854d6d76871750e2a461b1030fb6c458cd1a Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Mon, 8 Feb 2016 11:34:21 +0000 Subject: [PATCH] [PATCH v3 1/2] emacs: Add `notmuch-show-forward-open-messages'. --- 3e/f28cb4e5899d58ca3705a19e925bffde7ca08c | 177 ++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 3e/f28cb4e5899d58ca3705a19e925bffde7ca08c diff --git a/3e/f28cb4e5899d58ca3705a19e925bffde7ca08c b/3e/f28cb4e5899d58ca3705a19e925bffde7ca08c new file mode 100644 index 000000000..c3b1e2cb4 --- /dev/null +++ b/3e/f28cb4e5899d58ca3705a19e925bffde7ca08c @@ -0,0 +1,177 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 272336DE0B25 + for ; Mon, 8 Feb 2016 03:34:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.685 +X-Spam-Level: +X-Spam-Status: No, score=0.685 tagged_above=-999 required=5 tests=[AWL=0.752, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, + UNPARSEABLE_RELAY=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 WAgW5YTWB24M for ; + Mon, 8 Feb 2016 03:34:28 -0800 (PST) +Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com + [74.125.82.44]) by arlo.cworth.org (Postfix) with ESMTPS id 1D70C6DE0B22 for + ; Mon, 8 Feb 2016 03:34:28 -0800 (PST) +Received: by mail-wm0-f44.google.com with SMTP id c200so11059514wme.0 + for ; Mon, 08 Feb 2016 03:34:28 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=dme-org.20150623.gappssmtp.com; s=20150623; + h=from:to:subject:date:message-id:in-reply-to:references; + bh=c9o+JR0XKI5jUvSqsU9zuV+yYzhnEa8V0rljVZpfrW0=; + b=B2pLdwYOXcHStDW1eWVSYL+By5mul3FXWAk8rem22nLfo3MmE16An/M27Ho8I8xZY/ + baYO5Hly/tqD7FpfZv1dulPqxwWULNN2s3NMR9Cu9nuvtxASuSUJCM3Gcw5c/4Q/DgZa + tADUJdbJvxUjVf8h7Wcg4XCpfVnwnSyPGpWzbXDkzDDN7GBXAru1UhDaCLMXppcwC3KI + D3wpiyHj6Pfht+QhbrFQ5XqqOSBuqafeJ0mLo1z9G5t2/2kjDQNsWqsitMC6ZaW+3z5D + B4PDWxWUCwsCFEMsVQ7cc6dGU37bQoylr0kwOW1g4lp92XYueM+QCLb+dXLXU5kQkh3S + 6tPw== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to + :references; + bh=c9o+JR0XKI5jUvSqsU9zuV+yYzhnEa8V0rljVZpfrW0=; + b=MUMDJGjOzv3n9DA0WJKht8lVblSPwcxgeV34dzimI3WKtsaRX9OMmHV1ss9FQxFDC1 + J16hfNq/DP9B178FDP/djBdpwBD4iwPqR3cFhiVBuwe3jPWmdJ8VyJ9ZO/OgoHYQHOdD + vpnAwF/w4T+FOMj7N/6nb0HwBeO2PZi3NIBNbAhELo7mxJFu/6T5WcvCj2PcMPUN9vwT + aDsadSYd5E2SifZ+DSFo322W4EUD35g5K34GJOvW/WlKf55MwE9AYAH7nwjdPa90SA5T + 04L64JhowISqdeRU9FjfrWGVDApxouNVHWTebgeeLuC9zAlgUNP3xn20ozadWf9ASRaD + KcsQ== +X-Gm-Message-State: + AG10YORysX9v2gAeL5iV85/IYxZhC604NhIugJrIgttvOqihEfLAkSPTPcxhHBwk5S6Wjw== +X-Received: by 10.28.32.19 with SMTP id g19mr30626295wmg.98.1454931266838; + Mon, 08 Feb 2016 03:34:26 -0800 (PST) +Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. + [81.149.164.25]) + by smtp.gmail.com with ESMTPSA id t3sm29304900wjz.11.2016.02.08.03.34.25 + for + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 08 Feb 2016 03:34:25 -0800 (PST) +Received: from localhost (disaster-area.hh.sledj.net [local]) + by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id aec18193 + for ; Mon, 8 Feb 2016 11:34:22 +0000 (UTC) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v3 1/2] emacs: Add `notmuch-show-forward-open-messages'. +Date: Mon, 8 Feb 2016 11:34:21 +0000 +Message-Id: <1454931262-21362-2-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1454931262-21362-1-git-send-email-dme@dme.org> +References: <1454931262-21362-1-git-send-email-dme@dme.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Mon, 08 Feb 2016 11:34:30 -0000 + +Add a function to forward all open messages in the current view of a +thread. Bind this to "F". +--- + emacs/notmuch-mua.el | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + emacs/notmuch-show.el | 11 +++++++++++ + 2 files changed, 59 insertions(+) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index 5462f54..4d50d25 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -425,6 +425,54 @@ the From: address first." + (message-hide-headers) + (set-buffer-modified-p nil))) + ++(defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender) ++ "Compose a new message forwarding MESSAGES. ++ ++If PROMPT-FOR-SENDER is non-nil, the user will be prompteed for ++the From: address." ++ (let* ((other-headers ++ (when (or prompt-for-sender notmuch-always-prompt-for-sender) ++ (list (cons 'From (notmuch-mua-prompt-for-sender))))) ++ forward-subject) ;; Comes from the first message and is ++ ;; applied later. ++ ++ ;; Generate the template for the outgoing message. ++ (notmuch-mua-mail nil "" other-headers nil (notmuch-mua-get-switch-function)) ++ ++ (save-excursion ++ ;; Insert all of the forwarded messages. ++ (mapc (lambda (id) ++ (let ((temp-buffer (get-buffer-create ++ (concat "*notmuch-fwd-raw-" id "*")))) ++ ;; Get the raw version of this message in the buffer. ++ (with-current-buffer temp-buffer ++ (erase-buffer) ++ (let ((coding-system-for-read 'no-conversion)) ++ (call-process notmuch-command nil t nil "show" "--format=raw" id)) ++ ;; Because we process the messages in reverse order, ++ ;; always generate a forwarded subject, then use the ++ ;; last (i.e. first) one. ++ (setq forward-subject (message-make-forward-subject))) ++ ;; Make a copy ready to be forwarded in the ++ ;; composition buffer. ++ (message-forward-make-body temp-buffer) ++ ;; Kill the temporary buffer. ++ (kill-buffer temp-buffer))) ++ ;; `message-forward-make-body' always puts the message at ++ ;; the top, so do them in reverse order. ++ (reverse messages)) ++ ++ ;; Add in the appropriate subject. ++ (save-restriction ++ (message-narrow-to-headers) ++ (message-remove-header "Subject") ++ (message-add-header (concat "Subject: " forward-subject))) ++ ++ ;; `message-forward-make-body' shows the User-agent header. Hide ++ ;; it again. ++ (message-hide-headers) ++ (set-buffer-modified-p nil)))) ++ + (defun notmuch-mua-new-reply (query-string &optional prompt-for-sender reply-all) + "Compose a reply to the message identified by QUERY-STRING. + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 3345878..a8c6f1e 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1371,6 +1371,7 @@ reset based on the original query." + (define-key map (kbd "") 'notmuch-show-previous-button) + (define-key map (kbd "TAB") 'notmuch-show-next-button) + (define-key map "f" 'notmuch-show-forward-message) ++ (define-key map "F" 'notmuch-show-forward-open-messages) + (define-key map "l" 'notmuch-show-filter-thread) + (define-key map "r" 'notmuch-show-reply-sender) + (define-key map "R" 'notmuch-show-reply) +@@ -1798,6 +1799,16 @@ any effects from previous calls to + (with-current-notmuch-show-message + (notmuch-mua-new-forward-message prompt-for-sender))) + ++(put 'notmuch-show-forward-open-messages 'notmuch-prefix-doc ++ "... and prompt for sender") ++(defun notmuch-show-forward-open-messages (&optional prompt-for-sender) ++ "Forward the currently open messages." ++ (interactive "P") ++ (let ((open-messages (notmuch-show-get-message-ids-for-open-messages))) ++ (unless open-messages ++ (error "No open messages to forward.")) ++ (notmuch-mua-new-forward-messages open-messages prompt-for-sender))) ++ + (defun notmuch-show-next-message (&optional pop-at-end) + "Show the next message. + +-- +2.1.4 + -- 2.26.2