--- /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 arlo.cworth.org (Postfix) with ESMTP id 8973D6DE187B\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:25:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.283\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.283 tagged_above=-999 required=5 tests=[AWL=0.287,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id f3CkXgS71J1j for <notmuch@notmuchmail.org>;\r
+ Sat, 20 Feb 2016 10:25:08 -0800 (PST)\r
+Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com\r
+ [74.125.82.45]) by arlo.cworth.org (Postfix) with ESMTPS id 693886DE186E for\r
+ <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:56 -0800 (PST)\r
+Received: by mail-wm0-f45.google.com with SMTP id g62so107921917wme.0\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:56 -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:in-reply-to:references;\r
+ bh=EAXBYUl71fhbS6OiyyBabpTmArfujc13gDf7pA1YNPU=;\r
+ b=Gs6EPepGa1jE8AatOwaGya3NZ7ENFHy6f8c+wQTr6qXbNeHeV9u45aijUbI5dae4f5\r
+ 0UkkHkIQHmgswOxUXoCxqLOPKMiVdnHijmvalcSPGjTClNYPUorBbFHRujWgzaZlReI9\r
+ p6EneFqgQMttl7Eh9rEoIjkX93+S53jj8TihF5fYnucTgUFnAP+FMPgSWhc3TEehcZrK\r
+ zBkFg4xj0vhGnn2LljmdNaEM+jMmK7kKxrUlU+iNaHZHZAggZ4uMXl4a+OxgALyaG5QI\r
+ pV2RAfeH+346jGJ/Zd5DQaPkXgmxh5/5iNurWO5hPSWWkIzyuYU0GlRCGUb6eYcOwSK6\r
+ l3Gg==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=EAXBYUl71fhbS6OiyyBabpTmArfujc13gDf7pA1YNPU=;\r
+ b=QTvDBk+R/fHBmeeAHLGKnEA+X4tCLp3fQyCuHkoCEteWoKYhjUgmddFGmZ4JhN2Kno\r
+ CuxRRDpF/RagEGRT8x9k1fVnR9NZnM2WLw7Y8kmUHZ6RYKErxRoRcz9/a72pvDWAU5hv\r
+ jbePlFIYa5AiA/e539+tByWmwP9XX6m5L/VgZyvXO3ZkwIuj1FLq52EQwe3MArTU31pc\r
+ hP93hGa+libeVvRFF1P5ajr6nJVAf7z6YBWnEV/vlG+rNqzwrhxvndc6albZX2QOoLKF\r
+ zRVgwKgUZCUu67YUwbQIJh91k717Apg2AnQhXSIA42Qpr3OQADZPm9EPU6qbREKH8YBg\r
+ f2GA==\r
+X-Gm-Message-State:\r
+ AG10YORKp7jNlhA2PtRfLfADRxZfzV+Gi4HC/cxx9Oq8iwR7Lcl1wqMrgZxk5GNQu+PzcA==\r
+X-Received: by 10.28.146.145 with SMTP id u139mr3709360wmd.76.1455992695212;\r
+ Sat, 20 Feb 2016 10:24:55 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id t12sm13044826wmt.20.2016.02.20.10.24.54\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 20 Feb 2016 10:24:54 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 5/6] emacs/show: Remove the 'no-buttons option of\r
+ `notmuch-show-insert-bodypart'\r
+Date: Sat, 20 Feb 2016 18:24:39 +0000\r
+Message-Id: <1455992680-24978-6-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 20 Feb 2016 18:25:10 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+No code uses the 'no-buttons argument to\r
+`notmuch-show-insert-bodypart', so remove it.\r
+---\r
+ emacs/notmuch-show.el | 10 +++-------\r
+ 1 file changed, 3 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 8222f0d..2a81ec1 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -959,9 +959,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+ \r
+ HIDE determines whether to show or hide the part and the button\r
+ as follows: If HIDE is nil, show the part and the button. If HIDE\r
+-is t, hide the part initially and show the button. If HIDE is\r
+-'no-buttons, show the part but do not add any buttons (this is\r
+-useful for quoting in replies)."\r
++is t, hide the part initially and show the button."\r
+ \r
+ (let* ((content-type (downcase (plist-get part :content-type)))\r
+ (mime-type (notmuch-show-mime-type part))\r
+@@ -972,12 +970,10 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+ (beg (point))\r
+ ;; This default header-p function omits the part button for\r
+ ;; the first (or only) part if this is text/plain.\r
+- (button (when (and (not (equal hide 'no-buttons))\r
+- (funcall notmuch-show-insert-header-p-function part hide))\r
++ (button (when (funcall notmuch-show-insert-header-p-function part hide)\r
+ (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
+ ;; Hide the part initially if HIDE is t, or if it is too long\r
+- ;; and we have a button to allow toggling (thus reply which\r
+- ;; uses 'no-buttons automatically includes long parts)\r
++ ;; and we have a button to allow toggling.\r
+ (show-part (not (or (equal hide t)\r
+ (and long button))))\r
+ (content-beg (point)))\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff