[PATCH 1/2] test/emacs: test saving of attachment containing 8bit octets

[PATCH 1/2] test/emacs: test saving of attachment containing 8bit octets

[Tomi Ollila]

This test catches the case 8bit octets in an attachment gets converted
or lost when saving attachment to the file.
This test is marked known broken.
---
 test/emacs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/emacs b/test/emacs
index 77265b0..c8db7d0 100755
--- a/test/emacs
+++ b/test/emacs
@@ -516,6 +516,33 @@ test_emacs '(let ((standard-input "\"attachment2.gz\""))
 	      (notmuch-show-save-part "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com" 5))'
 test_expect_equal_file attachment2.gz "$EXPECTED/attachment"
 
+test_begin_subtest "Save 8bit attachment from within emacs using notmuch-show-save-attachments"
+test_subtest_known_broken
+
+add_message '[subject]="Attachment with 8bit chars"' \
+	'[header]="MIME-Version: 1.0"' \
+	'[content-type]="multipart/mixed; boundary=\"abcd\""' \
+	'[body]="--abcd
+Content-Type: text/plain
+
+Attachment follows:
+
+--abcd
+Content-Type: application/octet-stream; name=\"sample\"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename=\"sample\"
+
+“¡ Hey ! It compiles ¡ Ship it !”
+
+--abcd--
+"'
+test_emacs '(notmuch-show "id:'"${gen_msg_id}"'")
+	    (delete-file "OUTPUT")
+	    (let ((standard-input "\"OUTPUT\""))
+	      (notmuch-show-save-attachments))'
+
+test_expect_equal "$(cat OUTPUT)" '“¡ Hey ! It compiles ¡ Ship it !”'
+
 test_begin_subtest "View raw message within emacs"
 test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")
 	    (notmuch-show-view-raw-message)
-- 
1.8.0

[PATCH 2/2] emacs: less guessing of character set in messages

[Tomi Ollila]

The macro with-current-notmuch-show-message executes command
`notmuch show --format=raw id:...` which just outputs the contents
of the mail file verbatim (into temporary buffer). In case e.g. utf-8
locale is used the temporary buffer has buffer-file-coding-system as
utf-8. In this case Emacs converts the data to multibyte format, guessing
that input is in utf-8.
However, the "raw" (MIME) message may contain octet data in any other
8bit format, and as no (MIME-)content spesific handling to the message
is done at this point, conversion to other formats may lose information.
By setting coding-system-for-read 'no-conversion drops the conversion part
and makes this handle input as notmuch-get-bodypart-internal() does.
This marks the broken test in previous change fixed.
---
 emacs/notmuch-show.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 5b3e70e..44b6f35 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -203,9 +203,10 @@ For example, if you wanted to remove an \"unread\" tag and add a
      (let ((id (notmuch-show-get-message-id)))
        (let ((buf (generate-new-buffer (concat "*notmuch-msg-" id "*"))))
          (with-current-buffer buf
-	    (call-process notmuch-command nil t nil "show" "--format=raw" id)
-           ,@body)
-	 (kill-buffer buf)))))
+	   (let ((coding-system-for-read 'no-conversion))
+	     (call-process notmuch-command nil t nil "show" "--format=raw" id)
+	     ,@body)
+	   (kill-buffer buf))))))
 
 (defun notmuch-show-turn-on-visual-line-mode ()
   "Enable Visual Line mode."
-- 
1.8.0

Re: [PATCH 2/2] emacs: less guessing of character set in messages

[Ethan Glasser-Camp]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> The macro with-current-notmuch-show-message executes command
> `notmuch show --format=raw id:...` which just outputs the contents
> of the mail file verbatim (into temporary buffer). In case e.g. utf-8
> locale is used the temporary buffer has buffer-file-coding-system as
> utf-8. In this case Emacs converts the data to multibyte format, guessing
> that input is in utf-8.
> However, the "raw" (MIME) message may contain octet data in any other
> 8bit format, and as no (MIME-)content spesific handling to the message
> is done at this point, conversion to other formats may lose information.
> By setting coding-system-for-read 'no-conversion drops the conversion part
> and makes this handle input as notmuch-get-bodypart-internal() does.
> This marks the broken test in previous change fixed.

This looks good to me, though you might need to apply it with notmuch
show --format="mbox" :).

Ethan

Re: [PATCH 1/2] test/emacs: test saving of attachment containing 8bit octets

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> This test catches the case 8bit octets in an attachment gets converted
> or lost when saving attachment to the file.
> This test is marked known broken.

I pushed both, but I took the liberty of amending the second to actually
mark the test as fixed (i.e. removed the known broken line). Hopefully
that's what you meant to do.

d

Re: [PATCH 1/2] test/emacs: test saving of attachment containing 8bit octets

[Tomi Ollila]

On Tue, Nov 27 2012, David Bremner wrote:

> Tomi Ollila <tomi.ollila@iki.fi> writes:
>
>> This test catches the case 8bit octets in an attachment gets converted
>> or lost when saving attachment to the file.
>> This test is marked known broken.
>
> I pushed both, but I took the liberty of amending the second to actually
> mark the test as fixed (i.e. removed the known broken line). Hopefully
> that's what you meant to do.

tnx!

> d

Tomi