--- /dev/null
+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 8AE41431FD2\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 13:07:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.639\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.639 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ DNS_FROM_AHBL_RHSBL=2.438, FREEMAIL_ENVFROM_END_DIGIT=1,\r
+ FREEMAIL_FROM=0.001, 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 XMz5rhSmhbfi for <notmuch@notmuchmail.org>;\r
+ Thu, 22 Jan 2015 13:07:43 -0800 (PST)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 21E80431FCB for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 13:07:43 -0800\r
+ (PST)\r
+Received: by mail-wg0-f45.google.com with SMTP id x12so4066622wgg.4\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 13:07:42 -0800 (PST)\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=sh2PsD2N96QBs5RroDPKtfX7pAtfEuQy59mST5Lez1w=;\r
+ b=ve2LRDVzQX8qDAj57/3SqMeGGeHrLZ3UqeU/eFEx7ZrCkSvmuTdODascoPyszlKU2Q\r
+ b0AX8Ca6zHpwtnxbC8l5UGhWhLeLhs9kxFi0uoOPgbhedCLXqeEStuX39uF8Hb/w8f8X\r
+ lI3zYbQlslbZ3hQSPycgqbUe8QITD7Eovpt0A78dLnme0J5rX1GQ35O7LKX51+iw+t5F\r
+ gZaVam39DC2cLTHvFpsa40Dw4sVtaO1W8UML5Wkj7P+aSR/8iXVk6sgmeAzyQ+qz/X9/\r
+ GqzoFmcsguckzO3aMw/ZRbCLaB3dGUv2eLQVVdjh65RTFVuecxlt5ryWU2PzZxyiiazU\r
+ 3aqw==\r
+X-Received: by 10.180.206.165 with SMTP id lp5mr8894367wic.83.1421960862151;\r
+ Thu, 22 Jan 2015 13:07:42 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id l6sm5480649wjx.33.2015.01.22.13.07.34\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Thu, 22 Jan 2015 13:07:41 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: show: allow user to hide some mime types by default.\r
+Date: Thu, 22 Jan 2015 21:07:32 +0000\r
+Message-Id: <1421960852-26424-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\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: Thu, 22 Jan 2015 21:07:46 -0000\r
+\r
+This commit adds a customize variable that allows the user to choose\r
+to hide some mime types by default. They can still choose to view the\r
+part by toggling the part button.\r
+\r
+One use is for hiding all text/html parts. This would mean that some\r
+explicit user action was required before the part was loaded which\r
+would mitigate some of the problems of remote image loading by the\r
+emacs html renderer as detailed by dkg in\r
+id:87ppa7q25w.fsf@alice.fifthhorseman.net.\r
+---\r
+\r
+I think this might be useful anyway (dkg asked for it before he found\r
+the bug) but seems particularly relevant now.\r
+\r
+To use set the variable notmuch-show-always-hide-types to '(text/html)\r
+or use the customize setting to add text/html to the list.\r
+\r
+Given the lack of control we have over the emacs renderers (so\r
+possibility of future problems) we could even set this by default.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+emacs/notmuch-show.el | 18 +++++++++++++++++-\r
+ 1 file changed, 17 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9f6fe07..8f49f17 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -234,6 +234,15 @@ every user interaction with notmuch."\r
+ :type 'function\r
+ :group 'notmuch-show)\r
+ \r
++(defcustom notmuch-show-always-hide-types nil\r
++ "List of mime types that should always be hidden.\r
++\r
++This is a list of mime types that should be initally displayed in\r
++the show buffer as hidden parts; they can be displayed by\r
++toggling the part button. Wildcards are allowed in the list."\r
++ :type '(repeat string)\r
++ :group 'notmuch-show)\r
++\r
+ (defmacro with-current-notmuch-show-message (&rest body)\r
+ "Evaluate body with current buffer set to the text of current message"\r
+ `(save-excursion\r
+@@ -798,6 +807,12 @@ message at DEPTH in the current thread."\r
+ (intern (concat "notmuch-show-insert-part-" content-type))))\r
+ result))\r
+ \r
++(defun notmuch-show-always-hide (mime-type)\r
++ "Is mime-type in notmuch-show-always-hide-types"\r
++ (let (match)\r
++ (dolist (type notmuch-show-always-hide-types match)\r
++ (setq match (or match (notmuch-match-content-type mime-type type))))))\r
++\r
+ ;; \f\r
+\r
+ \r
+ (defun notmuch-show-insert-bodypart-internal (msg part content-type nth depth button)\r
+@@ -900,7 +915,8 @@ useful for quoting in replies)."\r
+ (nth (plist-get part :id))\r
+ (beg (point))\r
+ ;; Hide the part initially if HIDE is t.\r
+- (show-part (not (equal hide t)))\r
++ (show-part (and (not (equal hide t))\r
++ (not (notmuch-show-always-hide mime-type))))\r
+ ;; We omit the part button for the first (or only) part if\r
+ ;; this is text/plain, or HIDE is 'no-buttons.\r
+ (button (unless (or (equal hide 'no-buttons)\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff