Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 8B7F5431FBC for ; Wed, 13 Nov 2013 01:03:51 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 2.723 X-Spam-Level: ** X-Spam-Status: No, score=2.723 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=2.499, HS_INDEX_PARAM=0.023, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tjYwgbe2iU3J for ; Wed, 13 Nov 2013 01:03:47 -0800 (PST) Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id F3B16431FB6 for ; Wed, 13 Nov 2013 01:03:46 -0800 (PST) Received: by mail-bk0-f43.google.com with SMTP id mz13so170640bkb.30 for ; Wed, 13 Nov 2013 01:03:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=WhM6SV1kOLWMIjZYEPq1Sobvyl0BWy3YptJ2AGxwWXQ=; b=HmR6QOpT9d19Manruuq3LhqjyedHCPGSxOcZRbztUMKTMeTr1iNHYlY0pNN3RJzl51 vEJtixaUe5lSTV7cBQwGPWj22WPOj+1/6B8pVfgKmqK9mCVBWWzAjEntDNaDtNhEwAdV 7khD5HLWwYxSvESRiiJ1TommLLRKf7OulhAM5B3cMXHtApRDhv/mKQ5qmdlg0F4obVOE JmgcPll93kAStYUWbKgH80iKI+vi8Ubx0aIlOP3vHQrfgqZKJIMYtXyqalTccqIgn9mE mJ/sd5RA+v/boRL96BQ3Lj19WCJs3q4U1dRizlmR3xkLj37r0JzzVoJteEt5YGl8uzMN xxCA== X-Received: by 10.204.102.71 with SMTP id f7mr416071bko.57.1384333421849; Wed, 13 Nov 2013 01:03:41 -0800 (PST) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id kk2sm21457381bkb.10.2013.11.13.01.03.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 13 Nov 2013 01:03:41 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH] emacs: show: stop stderr appearing in buffer Date: Wed, 13 Nov 2013 09:03:37 +0000 Message-Id: <1384333417-13832-1-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Wed, 13 Nov 2013 09:03:51 -0000 In emacs 24.3+ the stdout/stderr from externally displaying an attachment gets inserted into the show buffer. This is caused by changes in mm-display-external in mm-decode.el. Ideally, we would put this output in the notmuch errors buffer but the handler is called asynchronously so we don't know when the output will appear. Thus if we put it straight into the errors buffer it could get interleaved with other errors. Also we can't easily tell when we have got all the error output so can't wait until the process is complete. One solution would be to create a new buffer for the stderr of each attachment viewed. Again, since we can't tell when the process has finished, we can't close these buffers automatically so this will leave lots of buffers around. Thus we add a debug variable notmuch-show-attachment-debug: it this is non-nil we create a new buffer for each viewer; if this variable is nil we just use a temp buffer which means all error output is discarded (this is the same behaviour as with emacs pre 24.3). --- This is a new version of id:1378502198-7980-1-git-send-email-markwalters1009@gmail.com I don't think there was complete consensus on the right thing to do here but most people wanted at least the option of seeing the stderr/stdout. This keeps the default behaviour the same as before, but adds a debug variable to put the stderr/stdout in its own buffer. Note: I always use emacs 23 so this is not heavily tested. Best wishes Mark emacs/notmuch-show.el | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f00273a..f9a3344 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -159,6 +159,8 @@ indentation." (make-variable-buffer-local 'notmuch-show-indent-content) (put 'notmuch-show-indent-content 'permanent-local t) +(defvar notmuch-show-attachment-debug nil) + (defcustom notmuch-show-stash-mlarchive-link-alist '(("Gmane" . "http://mid.gmane.org/") ("MARC" . "http://marc.info/?i=") @@ -2089,8 +2091,16 @@ caller is responsible for killing this buffer as appropriate." This ensures that the temporary buffer created for the mm-handle is destroyed when FN returns." (let ((handle (notmuch-show-current-part-handle))) + ;; emacs 24.3+ puts stdout/stderr into the calling buffer so we + ;; call it from a temp-buffer, unless + ;; notmuch-show-attachment-debug is non-nil in which case we put + ;; it in " *notmuch-part*". (unwind-protect - (funcall fn handle) + (if notmuch-show-attachment-debug + (with-current-buffer (generate-new-buffer " *notmuch-part*") + (funcall fn handle)) + (with-temp-buffer + (funcall fn handle))) (kill-buffer (mm-handle-buffer handle))))) (defun notmuch-show-part-button-default (&optional button) -- 1.7.9.1