From de8e702c5a40aa2471a9056586d2ac7dda31bf4f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 6 Apr 2015 07:59:13 +0900 Subject: [PATCH] [WIP2 11/12] emacs: convert notmuch-tree to format-version 3 --- 2b/19669887eb0b64b83da9e36ad23c136496c374 | 85 +++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 2b/19669887eb0b64b83da9e36ad23c136496c374 diff --git a/2b/19669887eb0b64b83da9e36ad23c136496c374 b/2b/19669887eb0b64b83da9e36ad23c136496c374 new file mode 100644 index 000000000..bfe18fb01 --- /dev/null +++ b/2b/19669887eb0b64b83da9e36ad23c136496c374 @@ -0,0 +1,85 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 5C8E36DE1BC4 + for ; Sun, 5 Apr 2015 16:03:22 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.511 +X-Spam-Level: +X-Spam-Status: No, score=0.511 tagged_above=-999 required=5 tests=[AWL=0.501, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Pk5QjLLDVjae for ; + Sun, 5 Apr 2015 16:03:20 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id C531E6DE1BB0 + for ; Sun, 5 Apr 2015 16:03:18 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YetYr-0002pw-AP; Sun, 05 Apr 2015 23:02:37 +0000 +Received: (nullmailer pid 2257 invoked by uid 1000); Sun, 05 Apr 2015 + 22:59:25 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [WIP2 11/12] emacs: convert notmuch-tree to format-version 3 +Date: Mon, 6 Apr 2015 07:59:13 +0900 +Message-Id: <1428274754-1698-12-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1428274754-1698-1-git-send-email-david@tethera.net> +References: <1428274754-1698-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Sun, 05 Apr 2015 23:03:22 -0000 + +This is similarly trivial conversion to that applied to +notmuch-search, and is subject to the same objections +--- + emacs/notmuch-tree.el | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +index ca5f9b6..bae3de0 100644 +--- a/emacs/notmuch-tree.el ++++ b/emacs/notmuch-tree.el +@@ -774,10 +774,11 @@ message together with all its descendents." + + (defun notmuch-tree-insert-forest-thread (forest-thread) + "Insert a single complete thread." +- (let (tree-status) +- ;; Reset at the start of each main thread. +- (setq notmuch-tree-previous-subject nil) +- (notmuch-tree-insert-thread forest-thread 0 tree-status))) ++ (unless (notmuch-query-metadata-p forest-thread) ++ (let (tree-status) ++ ;; Reset at the start of each main thread. ++ (setq notmuch-tree-previous-subject nil) ++ (notmuch-tree-insert-thread forest-thread 0 tree-status)))) + + (defun notmuch-tree-insert-forest (forest) + "Insert a forest of threads. +@@ -871,7 +872,7 @@ the same as for the function notmuch-tree." + (notmuch-tag-clear-cache) + (let ((proc (notmuch-start-notmuch + "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel +- "show" "--body=false" "--format=sexp" "--format-version=2" ++ "show" "--body=false" "--format=sexp" "--format-version=3" + message-arg search-args)) + ;; Use a scratch buffer to accumulate partial output. + ;; This buffer will be killed by the sentinel, which +-- +2.1.4 + -- 2.26.2