Re: [PATCH 5/5] emacs: make show set --exclude=flag

diff --git a/e7/091c17a65f2c0b0360bc41b861b13bb882e76a b/e7/091c17a65f2c0b0360bc41b861b13bb882e76a
new file mode 100644 (file)
index 0000000..503e905
--- /dev/null
+++ b/e7/091c17a65f2c0b0360bc41b861b13bb882e76a
@@ -0,0 +1,113 @@
+Return-Path: <amdragon@mit.edu>\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 A6D9A431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:52:19 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 ZdUCTV2+eltm for <notmuch@notmuchmail.org>;\r
+       Sat, 17 Mar 2012 09:52:17 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1ED89431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:52:17 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f8a6d000000914-8d-4f64c140f9d9\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id B8.6C.02324.041C46F4; Sat, 17 Mar 2012 12:52:16 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q2HGqGeM032161; \r
+       Sat, 17 Mar 2012 12:52:16 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2HGqFLt012230\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 17 Mar 2012 12:52:16 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1S8wrX-00047j-Ep; Sat, 17 Mar 2012 12:52:15 -0400\r
+Date: Sat, 17 Mar 2012 12:52:15 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 5/5] emacs: make show set --exclude=flag\r
+Message-ID: <20120317165215.GJ2670@mit.edu>\r
+References: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com>\r
+       <1331836925-31437-6-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1331836925-31437-6-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42IRYrdT0XU4mOJvcHiPrsXquTwW12/OZHZg\r
+       8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mr78f8hasJeromnjb/YGxrkcXYwcHBICJhLf\r
+       n3t2MXICmWISF+6tZ+ti5OIQEtjHKPHnxG1mCGcDo8SDmUfZIZyTTBL3P/yBKlvCKPF/5gxW\r
+       kH4WAVWJJUcOsIHYbAIaEtv2L2cEsUUEdCRuH1rADmIzC0hLfPvdzARiCwvYSBy81sQIcgav\r
+       gLZE01EekLCQQCejxIdvxiA2r4CgxMmZT1ggWrUkbvx7yQRSDjJm+T+wBzgFvCTO3FQCqRAV\r
+       UJGYcnIb2wRGoVlImmchaZ6F0LyAkXkVo2xKbpVubmJmTnFqsm5xcmJeXmqRrolebmaJXmpK\r
+       6SZGUEBzSvLvYPx2UOkQowAHoxIPL8eEZH8h1sSy4srcQ4ySHExKoryMB1L8hfiS8lMqMxKL\r
+       M+KLSnNSiw8xSnAwK4nwSi0HyvGmJFZWpRblw6SkOViUxHnVtN75CQmkJ5akZqemFqQWwWRl\r
+       ODiUJHg7QIYKFqWmp1akZeaUIKSZODhBhvMADd8PUsNbXJCYW5yZDpE/xagoJc7bCJIQAElk\r
+       lObB9cISzitGcaBXhHmXgVTxAJMVXPcroMFMQINnliWDDC5JREhJNTCWneCz9Ds+d9bM5Nf6\r
+       hf4vGzJmvnvIrv+45IX7uau79vm0Z6z79XLf1sLy4sNdTTXP2725+7ICLt7yz1r5/PTu6H8O\r
+       36oWdU3ft2m7z6x7fqKyr3IOvxP/p5xs/m5xlWzGmvWFCuUvr0XmbNpZYLuJJerbE++0ohfB\r
+       1X0ah+S5y8/kNh6adExQiaU4I9FQi7moOBEA+5PdchMDAAA=\r
+Cc: notmuch@notmuchmail.org\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, 17 Mar 2012 16:52:19 -0000\r
+\r
+Quoth Mark Walters on Mar 15 at  6:42 pm:\r
+> Show has to set --exclude=flag to deal with cases where it is asked\r
+> to show a single excluded message. It uses JSON so it can easily pass\r
+> the exclude information to the user.\r
+> ---\r
+>  emacs/notmuch-show.el |    6 ++++--\r
+>  1 files changed, 4 insertions(+), 2 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 4a60631..8ab2485 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -1099,13 +1099,15 @@ function is used."\r
+>                     (append (list "\'") basic-args\r
+>                             (list "and (" notmuch-show-query-context ")\'"))\r
+>                   (append (list "\'") basic-args (list "\'")))))\r
+> -    (notmuch-show-insert-forest (notmuch-query-get-threads args))\r
+> +    (notmuch-show-insert-forest (notmuch-query-get-threads\r
+> +                                 (append (list "--exclude=flag") args)))\r
+\r
+(cons "--exclude=flag" args)\r
+\r
+>      ;; If the query context reduced the results to nothing, run\r
+>      ;; the basic query.\r
+>      (when (and (eq (buffer-size) 0)\r
+>                 notmuch-show-query-context)\r
+>        (notmuch-show-insert-forest\r
+> -       (notmuch-query-get-threads basic-args))))\r
+> +       (notmuch-query-get-threads\r
+> +        (append (list "--exclude=flag") basic-args)))))\r
+\r
+Same here.\r
+\r
+>  \r
+>        (jit-lock-register #'notmuch-show-buttonise-links)\r
+>  \r