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 9F506429E45 for ; Fri, 5 Jul 2013 11:13:04 -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 EokVyktAayNw for ; Fri, 5 Jul 2013 11:12:58 -0700 (PDT) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 13C09431FC4 for ; Fri, 5 Jul 2013 11:11:53 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id m14so1644272eaj.30 for ; Fri, 05 Jul 2013 11:11:52 -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:x-mailer:in-reply-to:references; bh=Wnc0CMw22ZX1K84TiUD7Qom991BIBFdpC3W6s8EjsJ8=; b=adUdcgwj+3Egm7BSOljOjkgHD1oeYvWkR83S7YuS+9FTBvn0LEsuAFsKVsZXnY3f4a 0P9Aqb2kRWzt2q7GwhDOVDlyrNt0NrIIdeq/XgoztB7f7XnpdLyzGpvBRpyOLg7CIUXR D27v6dC/fLJ6ux6X3WNkwmft0kDzGc5Rd3ZVGOnQv9CyswWIK1CYq2sZ67TVnRpQJIMP 5xyBtocUCgRHWWxGoveY6BP+Wy6wqeruKRKdi/YKH9EIv8+s6HWPU6lDZ9d5VdRWclBK 8/F3GzSHa8jIhv5yF6itkLDGEQrghn2ywLaCJ5ehmE/VMMRBKA8AM/4eBWnxLCh82phy ezHA== X-Received: by 10.14.115.9 with SMTP id d9mr13274564eeh.87.1373047912940; Fri, 05 Jul 2013 11:11:52 -0700 (PDT) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id ci50sm15891053eeb.12.2013.07.05.11.11.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 05 Jul 2013 11:11:52 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH 11/11] contrib: pick: use close-message-pane for reply etc Date: Fri, 5 Jul 2013 19:11:18 +0100 Message-Id: <1373047878-20822-12-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1373047878-20822-1-git-send-email-markwalters1009@gmail.com> References: <1373047878-20822-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: Fri, 05 Jul 2013 18:13:05 -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 15c7e74..9587dda 100644 --- a/contrib/notmuch-pick/notmuch-pick.el +++ b/contrib/notmuch-pick/notmuch-pick.el @@ -236,6 +236,10 @@ FUNC." (define-key map "/" (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