From: Mark Walters Date: Thu, 22 Aug 2013 17:10:26 +0000 (+0100) Subject: [PATCH v3 11/11] contrib: pick: use close-message-pane for reply etc X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9653bd877aedb8081e1eb9f1e74e144396771e0;p=notmuch-archives.git [PATCH v3 11/11] contrib: pick: use close-message-pane for reply etc --- diff --git a/13/3a14b751d89a4659b6e708ebaa2980b3fc7bed b/13/3a14b751d89a4659b6e708ebaa2980b3fc7bed new file mode 100644 index 000000000..4896d62d7 --- /dev/null +++ b/13/3a14b751d89a4659b6e708ebaa2980b3fc7bed @@ -0,0 +1,139 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id EA5A7429E5C + for ; Thu, 22 Aug 2013 10:11:38 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id xc0Wk2tpHQz8 for ; + Thu, 22 Aug 2013 10:11:33 -0700 (PDT) +Received: from mail-we0-f176.google.com (mail-we0-f176.google.com + [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 37A47429E4D + for ; Thu, 22 Aug 2013 10:10:59 -0700 (PDT) +Received: by mail-we0-f176.google.com with SMTP id q56so1927653wes.21 + for ; Thu, 22 Aug 2013 10:10:58 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=Vw+jIYny2aEJe8NNd7HlLHtABC6svW3HFSPkWhrf10o=; + b=yJ225FHx/11InPcOj4VEGMn66kg6EunVJwNOxehwjIR+DFKazWwF3SlDF1KcIHk6aD + h4dCr0Qkc2DYqXYUkNDKGI1gVw2aeqv3+eGJ7lEVIvT+UgZmpa6RDAWASj49RYA1TERv + P/vO+pdT7beVQ7lgxA5X2TJqbz2IZCSEAxFw+ve+ROMzp5gNC/wwnisz7U4/YUdAuDRr + EIa030rPJ9JxOCaricbsFitBQHuoDpwX/UBGYiVotpGpbwspK2EI7gLHcfkV9b15uVuN + kTiuadDIbUoMi5ayii9+q9HPoXdsgZN+DdnW+4HrlpF43C5L9bA+/XcaJ4qVIDDnyzJh + 7jlQ== +X-Received: by 10.180.185.166 with SMTP id fd6mr21977636wic.5.1377191458084; + Thu, 22 Aug 2013 10:10:58 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id a8sm39517330wie.6.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Thu, 22 Aug 2013 10:10:57 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 11/11] contrib: pick: use close-message-pane for reply etc +Date: Thu, 22 Aug 2013 18:10:26 +0100 +Message-Id: <1377191427-6821-12-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1377191427-6821-1-git-send-email-markwalters1009@gmail.com> +References: <1377191427-6821-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Thu, 22 Aug 2013 17:11:39 -0000 + +We can save some code duplication by using the new close-message-pane +functionality for reply, forward, and new mail. +--- + contrib/notmuch-pick/notmuch-pick.el | 43 +++------------------------------ + 1 files changed, 4 insertions(+), 39 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 6e71fef..37dc161 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -236,6 +236,10 @@ FUNC." + (define-key map "e" (notmuch-pick-to-message-pane #'notmuch-pick-button-activate)) + + ;; bindings from show (or elsewhere) but we close the message pane first. ++ (define-key map "m" (notmuch-pick-close-message-pane-and #'notmuch-mua-new-mail)) ++ (define-key map "f" (notmuch-pick-close-message-pane-and #'notmuch-show-forward-message)) ++ (define-key map "r" (notmuch-pick-close-message-pane-and #'notmuch-show-reply-sender)) ++ (define-key map "R" (notmuch-pick-close-message-pane-and #'notmuch-show-reply)) + (define-key map "V" (notmuch-pick-close-message-pane-and #'notmuch-show-view-raw-message)) + (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help)) + +@@ -246,10 +250,6 @@ FUNC." + (define-key map "=" 'notmuch-pick-refresh-view) + (define-key map "s" 'notmuch-pick-to-search) + (define-key map "z" 'notmuch-pick-to-pick) +- (define-key map "m" 'notmuch-pick-new-mail) +- (define-key map "f" 'notmuch-pick-forward-message) +- (define-key map "r" 'notmuch-pick-reply-sender) +- (define-key map "R" 'notmuch-pick-reply) + (define-key map "n" 'notmuch-pick-next-matching-message) + (define-key map "p" 'notmuch-pick-prev-matching-message) + (define-key map "N" 'notmuch-pick-next-message) +@@ -599,41 +599,6 @@ message will be \"unarchived\", i.e. the tag changes in + target + (get-buffer buffer-name)))) + +-(defmacro with-current-notmuch-pick-message (&rest body) +- "Evaluate body with current buffer set to the text of current message" +- `(save-excursion +- (let ((id (notmuch-pick-get-message-id))) +- (let ((buf (generate-new-buffer (concat "*notmuch-msg-" id "*")))) +- (with-current-buffer buf +- (call-process notmuch-command nil t nil "show" "--format=raw" id) +- ,@body) +- (kill-buffer buf))))) +- +-(defun notmuch-pick-new-mail (&optional prompt-for-sender) +- "Compose new mail." +- (interactive "P") +- (notmuch-pick-close-message-window) +- (notmuch-mua-new-mail prompt-for-sender )) +- +-(defun notmuch-pick-forward-message (&optional prompt-for-sender) +- "Forward the current message." +- (interactive "P") +- (notmuch-pick-close-message-window) +- (with-current-notmuch-pick-message +- (notmuch-mua-new-forward-message prompt-for-sender))) +- +-(defun notmuch-pick-reply (&optional prompt-for-sender) +- "Reply to the sender and all recipients of the current message." +- (interactive "P") +- (notmuch-pick-close-message-window) +- (notmuch-mua-new-reply (notmuch-pick-get-message-id) prompt-for-sender t)) +- +-(defun notmuch-pick-reply-sender (&optional prompt-for-sender) +- "Reply to the sender of the current message." +- (interactive "P") +- (notmuch-pick-close-message-window) +- (notmuch-mua-new-reply (notmuch-pick-get-message-id) prompt-for-sender nil)) +- + (defun notmuch-pick-clean-address (address) + "Try to clean a single email ADDRESS for display. Return + AUTHOR_NAME if present, otherwise return AUTHOR_EMAIL. Return +-- +1.7.9.1 +