From 60f5cd371072d9791dbb9a34bc0cda6cb0006583 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Mon, 3 Dec 2012 01:22:53 +0000 Subject: [PATCH] Re: [PATCH] emacs: show: make show-get-message-prop usable from pick --- 40/d211da7434f28b7555d5aa9d2c36bd761bba48 | 136 ++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 40/d211da7434f28b7555d5aa9d2c36bd761bba48 diff --git a/40/d211da7434f28b7555d5aa9d2c36bd761bba48 b/40/d211da7434f28b7555d5aa9d2c36bd761bba48 new file mode 100644 index 000000000..d38428686 --- /dev/null +++ b/40/d211da7434f28b7555d5aa9d2c36bd761bba48 @@ -0,0 +1,136 @@ +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 76D12431FB6 + for ; Sun, 2 Dec 2012 17:22:59 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 SZUcBBFEFbiR for ; + Sun, 2 Dec 2012 17:22:57 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D7D88431FAE + for ; Sun, 2 Dec 2012 17:22:56 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1TfKkH-000281-2U; Mon, 03 Dec 2012 01:22:53 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1TfKkG-000429-Nz; Mon, 03 Dec 2012 01:22:52 +0000 +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: Re: [PATCH] emacs: show: make show-get-message-prop usable from pick +In-Reply-To: <1354486881-32456-1-git-send-email-markwalters1009@gmail.com> +References: <1354483744-27541-1-git-send-email-markwalters1009@gmail.com> + <1354486881-32456-1-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Mon, 03 Dec 2012 01:22:53 +0000 +Message-ID: <87ip8kszde.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: ba5ea7ff61b574f194e6c0f9eae19574 (of first 20000 bytes) +X-SpamAssassin-Score: -1.7 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.7 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.6 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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: Mon, 03 Dec 2012 01:22:59 -0000 + + +Hi + +On Sun, 02 Dec 2012, Mark Walters wrote: +> Make notmuch-show-get-prop choose the get-message-properties routine +> based on the major mode. This make it usable from notmuch-pick and +> thus a large number of functions are usable directly from +> notmuch-show.el and do not need to be reimplemented in pick. +> --- +> +> Ok so the previous version was me being stupid. I was wanting to avoid +> errors caused by notmuch-pick-get-message-properties not existing but +> the obvious solution is just to define it in a trivial fashion as +> here. + +and to continue the stupidity the first hunk is no longer needed: it's +just the second hunk now. + +MW + +> +> Anyway would this be acceptable? +> +> Best wishes +> +> Mark +> +> +> emacs/notmuch-show.el | 10 +++++++++- +> 1 files changed, 9 insertions(+), 1 deletions(-) +> +> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +> index 4d6c014..b7f64e3 100644 +> --- a/emacs/notmuch-show.el +> +++ b/emacs/notmuch-show.el +> @@ -1378,6 +1378,10 @@ Some useful entries are: +> (notmuch-show-move-to-message-top) +> (get-text-property (point) :notmuch-message-properties))) +> +> +(defun notmuch-show-mode-get-message-properties () +> + "Wrapper for notmuch-show-get-message-properties" +> + (notmuch-show-get-message-properties)) +> + +> (defun notmuch-show-set-prop (prop val &optional props) +> (let ((inhibit-read-only t) +> (props (or props +> @@ -1385,9 +1389,13 @@ Some useful entries are: +> (plist-put props prop val) +> (notmuch-show-set-message-properties props))) +> +> +(defun notmuch-pick-get-message-properties ()) +> + +> (defun notmuch-show-get-prop (prop &optional props) +> (let ((props (or props +> - (notmuch-show-get-message-properties)))) +> + (if (eq major-mode 'notmuch-show-mode) +> + (notmuch-show-get-message-properties) +> + (notmuch-pick-get-message-properties))))) +> (plist-get props prop))) +> +> (defun notmuch-show-get-message-id (&optional bare) +> -- +> 1.7.9.1 -- 2.26.2