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 3A03B431FD2 for ; Mon, 18 Nov 2013 13:16:20 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.224 X-Spam-Level: X-Spam-Status: No, score=0.224 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, 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 ui-nXO9zz2cp for ; Mon, 18 Nov 2013 13:16:11 -0800 (PST) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id AC0A1431FC2 for ; Mon, 18 Nov 2013 13:16:11 -0800 (PST) Received: by mail-wi0-f169.google.com with SMTP id hj6so472941wib.0 for ; Mon, 18 Nov 2013 13:16:10 -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:in-reply-to:references; bh=noe/sahnCw7qjloOrtDWEEy/NHnTaF4kGV0aMotw0a0=; b=gHktO7ygmocCh+QizpibRykaVXO0NLg340j5zc3hnTUaQs8PUBC0cRgAHzfpU3klzb fjldsPHqk6fTo4CVMxDGEPF9BbZu98oCIbAjWZEPRYvoWn4ia5CI919QixSL992hGAFw npNylDJ4XCX6cqxNnxnTTugFtH5Tq1EFBDRxKcu817Z5ViR1NIjemuRMQrt4I+dt69Y0 OpXQS4OyZelIojQANOD8kUwJ4k8anypOFnfDPnXyXkhbY3LeOPQeorHVeV4U35DYvBn0 jNVkI9BqIoJs0stzZCneM7Ydr1l36mT9NhezdZz8KS0PnL82F1LFZ6G7n51I48FjrY8I KCnA== X-Received: by 10.180.206.239 with SMTP id lr15mr8534400wic.35.1384809041371; Mon, 18 Nov 2013 13:10: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 ll10sm27844079wic.9.2013.11.18.13.10.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 18 Nov 2013 13:10:40 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v2] emacs: show: stop stderr appearing in buffer Date: Mon, 18 Nov 2013 21:10:33 +0000 Message-Id: <1384809033-27624-1-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <8761rqvt7f.fsf@zancas.localnet> References: <8761rqvt7f.fsf@zancas.localnet> 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: Mon, 18 Nov 2013 21:16:20 -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 version just adds a docstring to the debug variable describing what it does and where the debug data is stored (ie what the buffer name is). Best wishes Mark emacs/notmuch-show.el | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f00273a..784644c 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -159,6 +159,15 @@ indentation." (make-variable-buffer-local 'notmuch-show-indent-content) (put 'notmuch-show-indent-content 'permanent-local t) +(defvar notmuch-show-attachment-debug nil + "If t log stdout and stderr from attachment handlers + +When set to nil (the default) stdout and stderr from attachment +handlers is discarded. When set to t the stdout and stderr from +each attachment handler is logged in buffers with names beginning +\" *notmuch-part*\". This option requires emacs version at least +24.3 to work.") + (defcustom notmuch-show-stash-mlarchive-link-alist '(("Gmane" . "http://mid.gmane.org/") ("MARC" . "http://marc.info/?i=") @@ -2089,8 +2098,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