--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 54347431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Apr 2012 13:34:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id U762HNNAJI82 for <notmuch@notmuchmail.org>;\r
+ Sat, 14 Apr 2012 13:34:56 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7AAA0431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Apr 2012 13:34:56 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SJ9gJ-0000Gy-RD; Sat, 14 Apr 2012 21:34:52 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SJ9gJ-0006OO-Hi; Sat, 14 Apr 2012 21:34:51 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH 2/5] emacs: allow notmuch-tag to accept string inputs and\r
+ prompt for tags\r
+In-Reply-To: <1334429574-12918-3-git-send-email-jrollins@finestructure.net>\r
+References: <1333845338-22960-1-git-send-email-jrollins@finestructure.net>\r
+ <1334429574-12918-1-git-send-email-jrollins@finestructure.net>\r
+ <1334429574-12918-2-git-send-email-jrollins@finestructure.net>\r
+ <1334429574-12918-3-git-send-email-jrollins@finestructure.net>\r
+User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 14 Apr 2012 21:35:09 +0100\r
+Message-ID: <878vhyt5ky.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: e0635b4381a868d44440cf1ae961df84 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 14 Apr 2012 20:34:57 -0000\r
+\r
+On Sat, 14 Apr 2012, Jameson Graef Rollins <jrollins@finestructure.net> wrote:\r
+> notmuch-tag is extended to accept various formats of the tag changes.\r
+> In particular, user prompting for tag changes is now incorporated\r
+> here, so it is common for modes.\r
+>\r
+> The tag binary and the notmuch-{before,after}-tag-hooks are only\r
+> called if tag changes is non-nil.\r
+>\r
+> The actual tag-changes applied are returned by the function.\r
+> ---\r
+> emacs/notmuch-tag.el | 20 +++++++++++++++-----\r
+> 1 file changed, 15 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+> index c25cff8..dd7f9d7 100644\r
+> --- a/emacs/notmuch-tag.el\r
+> +++ b/emacs/notmuch-tag.el\r
+> @@ -108,18 +108,26 @@ from TAGS if present."\r
+> (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))\r
+> (sort result-tags 'string<)))\r
+> \r
+> -(defun notmuch-tag (query &rest tag-changes)\r
+> +(defun notmuch-tag (query &optional tag-changes)\r
+> "Add/remove tags in TAG-CHANGES to messages matching QUERY.\r
+> \r
+> -TAG-CHANGES should be a list of strings of the form \"+tag\" or\r
+> -\"-tag\" and QUERY should be a string containing the\r
+> -search-query.\r
+> +QUERY should be a string containing the search-terms.\r
+> +TAG-CHANGES can take multiple forms. If TAG-CHANGES is a list of\r
+> +strings of the form \"+tag\" or \"-tag\" then those are the tag\r
+> +changes applied. If TAG-CHANGES is a string then it is\r
+> +interpreted as a single tag change. If TAG-CHANGES is the string\r
+> +\"-\" or \"+\", or null, then the user is prompted to enter the\r
+> +tag changes.\r
+> \r
+> Note: Other code should always use this function alter tags of\r
+> messages instead of running (notmuch-call-notmuch-process \"tag\" ..)\r
+> directly, so that hooks specified in notmuch-before-tag-hook and\r
+> notmuch-after-tag-hook will be run."\r
+> ;; Perform some validation\r
+> + (if (string-or-null-p tag-changes)\r
+> + (if (or (string= tag-changes "-") (string= tag-changes "+") (null tag-changes))\r
+> + (setq tag-changes (notmuch-read-tag-changes tag-changes query))\r
+> + (setq tag-changes (list tag-changes))))\r
+> (mapc (lambda (tag-change)\r
+> (unless (string-match-p "^[-+]\\S-+$" tag-change)\r
+> (error "Tag must be of the form `+this_tag' or `-that_tag'")))\r
+> @@ -128,7 +136,9 @@ notmuch-after-tag-hook will be run."\r
+> (run-hooks 'notmuch-before-tag-hook)\r
+> (apply 'notmuch-call-notmuch-process "tag"\r
+> (append tag-changes (list "--" query)))\r
+> - (run-hooks 'notmuch-after-tag-hook)))\r
+> + (run-hooks 'notmuch-after-tag-hook))\r
+\r
+Hi\r
+\r
+The series looks good to me with one minor point:\r
+\r
+> + ;; return the list of actual changed tags\r
+> + tag-changes)\r
+\r
+I found the comment confusing: I read it as the function looked at the\r
+tags the message had before and after and returned the\r
+difference. Perhaps something like "in all cases we return tag-changes\r
+as a list" (and a similar comment for the commit message).\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
projects / notmuch-archives.git / commitdiff