[PATCH 19/25] emacs: fix notmuch-show-part-button to not include newline

diff --git a/20/43b6448701c0e612939e64439e24330f487cb2 b/20/43b6448701c0e612939e64439e24330f487cb2
new file mode 100644 (file)
index 0000000..e0efa2a
--- /dev/null
+++ b/20/43b6448701c0e612939e64439e24330f487cb2
@@ -0,0 +1,121 @@
+Return-Path: <jrollins@servo.finestructure.net>\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 C24A2429E2F\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
+       tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
+       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 tQYuLVyDvgfC for <notmuch@notmuchmail.org>;\r
+       Sat, 28 May 2011 14:52:25 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 15410429E3B\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:16 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 9145E328157;\r
+       Sat, 28 May 2011 14:45:48 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com\r
+       [98.149.172.122]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id C882D2E50E83;\r
+       Sat, 28 May 2011 14:45:45 -0700 (PDT)\r
+Received: by servo.finestructure.net (Postfix, from userid 1000)\r
+       id 4EBD7853; Sat, 28 May 2011 14:52:05 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 19/25] emacs: fix notmuch-show-part-button to not include\r
+       newline\r
+Date: Sat, 28 May 2011 14:51:54 -0700\r
+Message-Id: <1306619520-25730-20-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1306619520-25730-19-git-send-email-jrollins@finestructure.net>\r
+References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-2-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-3-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-4-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-5-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-6-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-7-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-8-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-9-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-10-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-11-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-12-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-13-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-14-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-15-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-16-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-17-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-18-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-19-git-send-email-jrollins@finestructure.net>\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: Sat, 28 May 2011 21:52:27 -0000\r
+\r
+This makes the button cleaner, so that it doesn't include the entire\r
+rest of the line that the button is on.\r
+---\r
+ emacs/notmuch-show.el |   29 +++++++++++++++++------------\r
+ 1 files changed, 17 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 6c498ab..a25ad99 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -280,18 +280,23 @@ message at DEPTH in the current thread."\r
+   'face 'message-mml)\r
+ \r
+ (defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)\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
+-         " ]\n")\r
+-   :type 'notmuch-show-part-button-type\r
+-   :notmuch-part nth\r
+-   :notmuch-filename name))\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
+ \r
+ ;; Functions handling particular MIME parts.\r
+ \r
+-- \r
+1.7.4.4\r
+\r