[PATCH 1/3 v2] emacs: Don't return the button from `notmuch-show-insert-part-header'.

diff --git a/20/bf5bf224f463e16ec2e4a25810fe21de51dc22 b/20/bf5bf224f463e16ec2e4a25810fe21de51dc22
new file mode 100644 (file)
index 0000000..47620ca
--- /dev/null
+++ b/20/bf5bf224f463e16ec2e4a25810fe21de51dc22
@@ -0,0 +1,180 @@
+Return-Path: <dme@dme.org>\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 68B5C421198\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 DB2LxKdKC19b for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jan 2012 02:33:11 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 87FF0429E54\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:11 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so489155wib.26\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 02:33:10 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.92.101 with SMTP id cl5mr12179219wib.21.1327314790449;\r
+       Mon, 23 Jan 2012 02:33:10 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id dr5sm39705841wib.0.2012.01.23.02.33.08\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 23 Jan 2012 02:33:08 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id AC787A0950; Mon, 23 Jan 2012 10:33:06 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3 v2] emacs: Don't return the button from\r
+       `notmuch-show-insert-part-header'.\r
+Date: Mon, 23 Jan 2012 10:33:02 +0000\r
+Message-Id: <1327314784-22555-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <cun39b66avm.fsf@hotblack-desiato.hh.sledj.net>\r
+References: <cun39b66avm.fsf@hotblack-desiato.hh.sledj.net>\r
+X-Gm-Message-State:\r
+ ALoCoQn36l3v5NpW85JkBvovLi6eUNRmM/oE5/mc/NMH2wGGnzuQXC3BXM6d6sI7jfVl3FFACjtZ\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: Mon, 23 Jan 2012 10:33:12 -0000\r
+\r
+Instead, allow the caller to specify some parameters for the\r
+button. Rework `notmuch-show-insert-part-multipart/signed' and\r
+`notmuch-show-insert-part-multipart/encrypted' accordingly.\r
+---\r
+\r
+Removed the merge of multipart/signed and multipart/encrypted.\r
+\r
+ emacs/notmuch-show.el |   84 +++++++++++++++++++++++++-----------------------\r
+ 1 files changed, 44 insertions(+), 40 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 03c1f6b..9144484 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -285,24 +285,23 @@ message at DEPTH in the current thread."\r
+   'follow-link t\r
+   'face 'message-mml)\r
+ \r
+-(defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)\r
+-  (let ((button))\r
+-    (setq button\r
+-        (insert-button\r
+-         (concat "[ "\r
+-                 (if name (concat name ": ") "")\r
+-                 declared-type\r
+-                 (if (not (string-equal declared-type content-type))\r
+-                     (concat " (as " content-type ")")\r
+-                   "")\r
+-                 (or comment "")\r
+-                 " ]")\r
+-         :type 'notmuch-show-part-button-type\r
+-         :notmuch-part nth\r
+-         :notmuch-filename name))\r
+-    (insert "\n")\r
+-    ;; return button\r
+-    button))\r
++(defun notmuch-show-insert-part-header (nth content-type declared-type\r
++                                          &optional name comment\r
++                                          &rest button-parameters)\r
++  (apply #'insert-button\r
++       (concat "[ "\r
++               (if name (concat name ": ") "")\r
++               declared-type\r
++               (if (not (string-equal declared-type content-type))\r
++                   (concat " (as " content-type ")")\r
++                 "")\r
++               (or comment "")\r
++               " ]")\r
++       :type 'notmuch-show-part-button-type\r
++       :notmuch-part nth\r
++       :notmuch-filename name\r
++       button-parameters)\r
++  (insert "\n"))\r
+ \r
+ ;; Functions handling particular MIME parts.\r
+ \r
+@@ -460,15 +459,18 @@ current buffer, if possible."\r
+   t)\r
+ \r
+ (defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth declared-type)\r
+-  (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil)))\r
+-    (button-put button 'face 'notmuch-crypto-part-header)\r
+-    ;; add signature status button if sigstatus provided\r
+-    (if (plist-member part :sigstatus)\r
+-      (let* ((from (notmuch-show-get-header :From msg))\r
+-             (sigstatus (car (plist-get part :sigstatus))))\r
+-        (notmuch-crypto-insert-sigstatus-button sigstatus from))\r
+-      ;; if we're not adding sigstatus, tell the user how they can get it\r
+-      (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")))\r
++  ;; Add signature status button if sigstatus provided.\r
++  (if (plist-member part :sigstatus)\r
++      (let ((from (notmuch-show-get-header :From msg))\r
++          (sigstatus (car (plist-get part :sigstatus))))\r
++      (notmuch-show-insert-part-header nth declared-type content-type nil nil \r
++                                       'face 'notmuch-crypto-part-header)\r
++      (notmuch-crypto-insert-sigstatus-button sigstatus from))\r
++\r
++    ;; If we're not adding sigstatus, tell the user how to enable it.\r
++    (notmuch-show-insert-part-header nth declared-type content-type nil nil \r
++                                   'face 'notmuch-crypto-part-header\r
++                                   'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))\r
+ \r
+   (let ((inner-parts (plist-get part :content))\r
+       (start (point)))\r
+@@ -482,19 +484,21 @@ current buffer, if possible."\r
+   t)\r
+ \r
+ (defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth declared-type)\r
+-  (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil)))\r
+-    (button-put button 'face 'notmuch-crypto-part-header)\r
+-    ;; add encryption status button if encstatus specified\r
+-    (if (plist-member part :encstatus)\r
+-      (let ((encstatus (car (plist-get part :encstatus))))\r
+-        (notmuch-crypto-insert-encstatus-button encstatus)\r
+-        ;; add signature status button if sigstatus specified\r
+-        (if (plist-member part :sigstatus)\r
+-            (let* ((from (notmuch-show-get-header :From msg))\r
+-                   (sigstatus (car (plist-get part :sigstatus))))\r
+-              (notmuch-crypto-insert-sigstatus-button sigstatus from))))\r
+-      ;; if we're not adding encstatus, tell the user how they can get it\r
+-      (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")))\r
++  ;; Add encryption status button if encstatus provided.\r
++  (if (plist-member part :encstatus)\r
++      (let ((encstatus (car (plist-get part :encstatus))))\r
++      (notmuch-show-insert-part-header nth declared-type content-type nil nil \r
++                                       'face 'notmuch-crypto-part-header)\r
++      (notmuch-crypto-insert-encstatus-button encstatus)\r
++      ;; add signature status button if sigstatus specified\r
++      (if (plist-member part :sigstatus)\r
++          (let* ((from (notmuch-show-get-header :From msg))\r
++                 (sigstatus (car (plist-get part :sigstatus))))\r
++            (notmuch-crypto-insert-sigstatus-button sigstatus from))))\r
++    ;; If we're not adding encstatus, tell the user how to enable it.\r
++    (notmuch-show-insert-part-header nth declared-type content-type nil nil \r
++                                   'face 'notmuch-crypto-part-header\r
++                                   'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))\r
+ \r
+   (let ((inner-parts (plist-get part :content))\r
+       (start (point)))\r
+-- \r
+1.7.8.3\r
+\r