1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id BFFEA431FC9
\r
6 for <notmuch@notmuchmail.org>; Tue, 23 Oct 2012 17:13:52 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id vEjqmUUP9CHL for <notmuch@notmuchmail.org>;
\r
18 Tue, 23 Oct 2012 17:13:52 -0700 (PDT)
\r
19 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com
\r
20 [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id B1FB1431FC0
\r
23 for <notmuch@notmuchmail.org>; Tue, 23 Oct 2012 17:13:51 -0700 (PDT)
\r
24 Received: by mail-wi0-f179.google.com with SMTP id hq7so3333696wib.2
\r
25 for <notmuch@notmuchmail.org>; Tue, 23 Oct 2012 17:13:50 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=QemQXsgPh/2jIhYvWU40KTSnI0ZIdDYy8ZjGkLyZ6vY=;
\r
29 b=cP6B6uBmST06m3/urN/MAUr46bU0UfMZtK4WfKqZve2fnYftS7k6YWkQDVyuKYO3gJ
\r
30 8l8XisPicWHQC+pK7k4RE/5NYQbAAth0UBcVXjSEGhAPvXKZPdDtvSV6NNHNAmUpvIKP
\r
31 UgcikvQ+tXgOdctGtaR/G3UTJCB0sYFFykIfI/apIy0VMIs4loIQc5oFTKghE3FIHnxO
\r
32 Y97EL43ADFk6OWAyTmdZWGmOJtIV7QqluLWuuIJrkKjcuJZ6q+/0j9NquUgxlX2HAtCE
\r
33 HhTftckZDvTLelsgpawLgJmVLI2QPV+0s5HudA89LXc+ZhRvzoJPkdEbH+pQ6aRV8UGb
\r
35 Received: by 10.216.203.1 with SMTP id e1mr8827224weo.103.1351037630621;
\r
36 Tue, 23 Oct 2012 17:13:50 -0700 (PDT)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPS id f1sm1423272wiy.2.2012.10.23.17.13.49
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Tue, 23 Oct 2012 17:13:49 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3 3/3] emacs: Code movement for the incremental JSON parser.
\r
44 Date: Wed, 24 Oct 2012 01:13:22 +0100
\r
45 Message-Id: <1351037602-11157-4-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 In-Reply-To: <1351037602-11157-1-git-send-email-markwalters1009@gmail.com>
\r
48 References: <1351037602-11157-1-git-send-email-markwalters1009@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Wed, 24 Oct 2012 00:13:53 -0000
\r
63 This just moves the notmuch-search-process-filter after the newly
\r
64 split out incremental json parser. I think this removes a warning in
\r
65 some versions of emacs.
\r
67 There should be no functional change.
\r
69 emacs/notmuch.el | 34 +++++++++++++++++-----------------
\r
70 1 files changed, 17 insertions(+), 17 deletions(-)
\r
72 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
73 index 7e5d052..ab253b7 100644
\r
74 --- a/emacs/notmuch.el
\r
75 +++ b/emacs/notmuch.el
\r
76 @@ -818,23 +818,6 @@ non-authors is found, assume that all of the authors match."
\r
77 (defvar notmuch-json-parser nil
\r
78 "Internal Incremental JSON parser Object.")
\r
80 -(defun notmuch-search-process-filter (proc string)
\r
81 - "Process and filter the output of \"notmuch search\""
\r
82 - (let ((results-buf (process-buffer proc))
\r
83 - (parse-buf (process-get proc 'parse-buf))
\r
84 - (inhibit-read-only t)
\r
86 - (if (not (buffer-live-p results-buf))
\r
87 - (delete-process proc)
\r
88 - (with-current-buffer parse-buf
\r
89 - ;; Insert new data
\r
91 - (goto-char (point-max))
\r
93 - (notmuch-json-parse-partial-list 'notmuch-search-show-result
\r
94 - 'notmuch-search-show-error
\r
97 (defun notmuch-json-parse-partial-list (result-function error-function results-buf)
\r
98 "Parse a partial JSON list from current buffer.
\r
100 @@ -884,6 +867,23 @@ RESULT-BUFFER to any input that was skipped."
\r
101 ;; Clear out what we've parsed
\r
102 (delete-region (point-min) (point))))
\r
104 +(defun notmuch-search-process-filter (proc string)
\r
105 + "Process and filter the output of \"notmuch search\""
\r
106 + (let ((results-buf (process-buffer proc))
\r
107 + (parse-buf (process-get proc 'parse-buf))
\r
108 + (inhibit-read-only t)
\r
110 + (if (not (buffer-live-p results-buf))
\r
111 + (delete-process proc)
\r
112 + (with-current-buffer parse-buf
\r
113 + ;; Insert new data
\r
115 + (goto-char (point-max))
\r
117 + (notmuch-json-parse-partial-list 'notmuch-search-show-result
\r
118 + 'notmuch-search-show-error
\r
121 (defun notmuch-search-tag-all (&optional tag-changes)
\r
122 "Add/remove tags from all messages in current search buffer.
\r