From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v3 3/3] emacs: Code movement for the incremental JSON parser.
Date: Wed, 24 Oct 2012 01:13:22 +0100
Message-Id: <1351037602-11157-4-git-send-email-markwalters1009@gmail.com>
In-Reply-To: <1351037602-11157-1-git-send-email-markwalters1009@gmail.com>
References: <1351037602-11157-1-git-send-email-markwalters1009@gmail.com>
Precedence: list

This just moves the notmuch-search-process-filter after the newly
split out incremental json parser. I think this removes a warning in
some versions of emacs.

There should be no functional change.
---
 emacs/notmuch.el |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 7e5d052..ab253b7 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -818,23 +818,6 @@ non-authors is found, assume that all of the authors match."
 (defvar notmuch-json-parser nil
   "Internal Incremental JSON parser Object.")
 
-(defun notmuch-search-process-filter (proc string)
-  "Process and filter the output of \"notmuch search\""
-  (let ((results-buf (process-buffer proc))
-	(parse-buf (process-get proc 'parse-buf))
-	(inhibit-read-only t)
-	done)
-    (if (not (buffer-live-p results-buf))
-	(delete-process proc)
-      (with-current-buffer parse-buf
-	;; Insert new data
-	(save-excursion
-	  (goto-char (point-max))
-	  (insert string))
-	(notmuch-json-parse-partial-list 'notmuch-search-show-result
-					 'notmuch-search-show-error
-					 results-buf)))))
-
 (defun notmuch-json-parse-partial-list (result-function error-function results-buf)
   "Parse a partial JSON list from current buffer.
 
@@ -884,6 +867,23 @@ RESULT-BUFFER to any input that was skipped."
     ;; Clear out what we've parsed
     (delete-region (point-min) (point))))
 
+(defun notmuch-search-process-filter (proc string)
+  "Process and filter the output of \"notmuch search\""
+  (let ((results-buf (process-buffer proc))
+	(parse-buf (process-get proc 'parse-buf))
+	(inhibit-read-only t)
+	done)
+    (if (not (buffer-live-p results-buf))
+	(delete-process proc)
+      (with-current-buffer parse-buf
+	;; Insert new data
+	(save-excursion
+	  (goto-char (point-max))
+	  (insert string))
+	(notmuch-json-parse-partial-list 'notmuch-search-show-result
+					 'notmuch-search-show-error
+					 results-buf)))))
+
 (defun notmuch-search-tag-all (&optional tag-changes)
   "Add/remove tags from all messages in current search buffer.
 
-- 
1.7.9.1