emacs: fix notmuch-show-part-button to not include newline

[notmuch] / emacs / notmuch-show.el

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 6c498ab1b8cff9cd53bb8620fb34b2448b7cd81b..47757a911f6759fdbbe660f3fc0d3fc18106461e 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -280,18 +280,23 @@ message at DEPTH in the current thread."
   'face 'message-mml)
 
 (defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)
-  (insert-button
-   (concat "[ "
-          (if name (concat name ": ") "")
-          declared-type
-          (if (not (string-equal declared-type content-type))
-              (concat " (as " content-type ")")
-            "")
-          (or comment "")
-          " ]\n")
-   :type 'notmuch-show-part-button-type
-   :notmuch-part nth
-   :notmuch-filename name))
+  (let ((button))
+    (setq button
+         (insert-button
+          (concat "[ "
+                  (if name (concat name ": ") "")
+                  declared-type
+                  (if (not (string-equal declared-type content-type))
+                      (concat " (as " content-type ")")
+                    "")
+                  (or comment "")
+                  " ]")
+          :type 'notmuch-show-part-button-type
+          :notmuch-part nth
+          :notmuch-filename name))
+    (insert "\n")
+    ;; return button
+    button))
 
 ;; Functions handling particular MIME parts.
 
@@ -306,10 +311,11 @@ message at DEPTH in the current thread."
                   "Filename to save as: "
                   (or mailcap-download-directory "~/")
                   nil nil
-                  filename))
-           (require-final-newline nil)
-           (coding-system-for-write 'no-conversion))
-       (write-region (point-min) (point-max) file)))))
+                  filename)))
+       ;; Don't re-compress .gz & al.  Arguably we should make
+       ;; `file-name-handler-alist' nil, but that would chop
+       ;; ange-ftp, which is reasonable to use here.
+       (mm-write-region (point-min) (point-max) file nil nil nil 'no-conversion t)))))
 
 (defun notmuch-show-mm-display-part-inline (msg part content-type content)
   "Use the mm-decode/mm-view functions to display a part in the