[PATCH] emacs: send notmuch-query stderr to /dev/null

diff --git a/99/8cd07c5c4e5cecb3f178fae44fed8b0d1adfff b/99/8cd07c5c4e5cecb3f178fae44fed8b0d1adfff
new file mode 100644 (file)
index 0000000..5ee73d6
--- /dev/null
+++ b/99/8cd07c5c4e5cecb3f178fae44fed8b0d1adfff
@@ -0,0 +1,78 @@
+Return-Path: <jrollins@finestructure.net>\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 0A3B7431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Jan 2011 13:54:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 AI6pdle7B8kV for <notmuch@notmuchmail.org>;\r
+       Wed, 26 Jan 2011 13:54:42 -0800 (PST)\r
+Received: from tarap.cc.columbia.edu (tarap.cc.columbia.edu [128.59.29.7])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1FB6F431FB5\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Jan 2011 13:54:42 -0800 (PST)\r
+Received: from servo.finestructure.net (c-24-19-44-201.hsd1.wa.comcast.net\r
+       [24.19.44.201])\r
+       (user=jgr2110 author=jrollins@finestructure.net mech=PLAIN bits=0)\r
+       by tarap.cc.columbia.edu (8.14.4/8.14.3) with ESMTP id p0QLsd74005156\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Jan 2011 16:54:41 -0500 (EST)\r
+Received: from jrollins by servo.finestructure.net with local (Exim 4.72)\r
+       (envelope-from <jrollins@finestructure.net>) id 1PiDK3-0005eu-Do\r
+       for notmuch@notmuchmail.org; Wed, 26 Jan 2011 13:54:39 -0800\r
+From: Jameson Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] emacs: send notmuch-query stderr to /dev/null\r
+Date: Wed, 26 Jan 2011 12:57:50 -0800\r
+Message-ID: <878vy7tjog.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-No-Spam-Score: Local\r
+X-Scanned-By: MIMEDefang 2.68 on 128.59.29.7\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: Wed, 26 Jan 2011 21:54:43 -0000\r
+\r
+The call-process to notmuch in notmuch-query.el was previously sending\r
+stderr into the output buffer.  This means that if there is any stderr\r
+the JSON parsing breaks.  Unfortunately call-process does not support\r
+sending stderr to a separate buffer or to the minibuffer [0], but it\r
+does support sending it to /dev/null.  So we do that here instead.\r
+\r
+[0] a bug was filed against emacs (#7842)\r
+---\r
+ emacs/notmuch-query.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index 26f9544..921f624 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -35,7 +35,7 @@ is a possibly empty forest of replies.\r
+        (json-false 'nil))\r
+     (with-temp-buffer\r
+       (progn\r
+-      (apply 'call-process (append (list notmuch-command nil t nil) args))\r
++      (apply 'call-process (append (list notmuch-command nil (list t nil) nil) args))\r
+       (goto-char (point-min))\r
+       (json-read)))))\r
+ \r
+-- \r
+1.7.2.3\r
+\r