[PATCH] emacs: show: stop stderr appearing in buffer

diff --git a/bc/0dcc1dced64a806ba5f81fdfa1073d069acb73 b/bc/0dcc1dced64a806ba5f81fdfa1073d069acb73
new file mode 100644 (file)
index 0000000..d4fefee
--- /dev/null
+++ b/bc/0dcc1dced64a806ba5f81fdfa1073d069acb73
@@ -0,0 +1,118 @@
+Return-Path: <markwalters1009@gmail.com>\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 AB8E9431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 14:16:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 valSYYqbky0c for <notmuch@notmuchmail.org>;\r
+       Fri,  6 Sep 2013 14:16:48 -0700 (PDT)\r
+Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com\r
+       [209.85.212.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F3BF4431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 14:16:47 -0700 (PDT)\r
+Received: by mail-wi0-f177.google.com with SMTP id cb5so1433993wib.10\r
+       for <notmuch@notmuchmail.org>; Fri, 06 Sep 2013 14:16:45 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=SxMCAEyFK6h/zLDEJCbxZ0I/5hgbjBd3YCUszpLZNgs=;\r
+       b=euPEjMdfqB16V26VRQkemTyg0wz6OBGgtRTXyzUAMIOPrYcekAESkxUu/TlLHMMP60\r
+       hyaFbTnN2L3T/HTkEn6HdW0E6yyOTLmcUAN1FQlr3h/lAIc6oCcPJdP7NuDClsmN9IvL\r
+       o3DZcADmtWsq/SaoHJGyhS5bNeRVUzqCwr9GLWu1lIFOc/kLUrv6o1fyUxvmzj0qUW+y\r
+       Js+qnax1+yVnsU2kI9LQplvyups01yCLNy9e2b93Mu9A+9UpXKkVLQZJh1foJCGLWXT/\r
+       Ytyylc6Z/+a22W9bWDfRp7ClJqBDDZwTYlDoF9AsiGsAxQzj7MNJoCDfLgbNpHJ3gkcG\r
+       LkxA==\r
+X-Received: by 10.180.19.196 with SMTP id h4mr3539696wie.38.1378502205345;\r
+       Fri, 06 Sep 2013 14:16:45 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id i12sm443431wiw.3.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 06 Sep 2013 14:16:44 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: show: stop stderr appearing in buffer\r
+Date: Fri,  6 Sep 2013 22:16:38 +0100\r
+Message-Id: <1378502198-7980-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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: Fri, 06 Sep 2013 21:16:55 -0000\r
+\r
+In emacs 24.3+ the stdout/stderr from externally displaying an\r
+attachment gets inserted into the show buffer. This is caused by\r
+changes in mm-display-external in mm-decode.el.\r
+\r
+Ideally, we would put this output in the notmuch errors buffer but the\r
+handler is called asynchronously so we don't know when the output will\r
+appear. Thus if we put it straight into the errors buffer it could get\r
+interleaved with other errors, otoh we can't easily tell when we\r
+have got all the error output so can't wait until the process is complete.\r
+\r
+This patch just takes the simplest approach and discards the error\r
+output (which means the behaviour is the same as it was with emacs pre\r
+24.3).\r
+---\r
+As I say above it would be nice to capture the error output but it\r
+does not appear to be simple. This is probably worth applying in the\r
+meantime as we definitely don't want the stderr/stdout appearing in\r
+the show buffer.\r
+\r
+The bug is easy to reproduce: make a script which outputs to stderr or\r
+stdout and call it on any part with ". o scriptname" (in fact even\r
+". o ls" will do!)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+\r
+\r
+\r
+ emacs/notmuch-show.el |    9 ++++++---\r
+ 1 files changed, 6 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 904b98e..42438ba 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -2044,9 +2044,12 @@ caller is responsible for killing this buffer as appropriate."\r
+ This ensures that the temporary buffer created for the mm-handle\r
+ is destroyed when FN returns."\r
+   (let ((handle (notmuch-show-current-part-handle)))\r
+-    (unwind-protect\r
+-      (funcall fn handle)\r
+-      (kill-buffer (mm-handle-buffer handle)))))\r
++    ;; emacs 24.3+ puts stdout/stderr into the calling buffer so we\r
++    ;; call it from a temp-buffer.\r
++    (with-temp-buffer\r
++      (unwind-protect\r
++        (funcall fn handle)\r
++      (kill-buffer (mm-handle-buffer handle))))))\r
+ \r
+ (defun notmuch-show-part-button-default (&optional button)\r
+   (interactive)\r
+-- \r
+1.7.9.1\r
+\r