X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT310-emacs.sh;h=61bc369af494208aa919073f244d835a3912ca45;hp=ac966e525a04af8f88daabf618cf7af9ef08afd5;hb=dfe15c0e1b18f4d9ab5d328399e56b3be4a251a5;hpb=92c3fd938e7a4e86edbc872eb5348dc048ec0e78

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index ac966e52..61bc369a 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 test_description="emacs interface"
-. ./test-lib.sh
+. ./test-lib.sh || exit 1
 
 EXPECTED=$TEST_DIRECTORY/emacs.expected-output
 
@@ -483,7 +483,7 @@ test_expect_equal_file OUTPUT EXPECTED
 test_begin_subtest "Reply within emacs to an html-only message"
 add_message '[content-type]="text/html"' \
 	    '[body]="Hi,<br />This is an <b>HTML</b> test message.<br /><br />OK?"'
-test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))
+test_emacs "(let ((message-hidden-headers '()))
 	    (notmuch-show \"id:${gen_msg_id}\")
 	    (notmuch-show-reply)
 	    (test-output))"
@@ -877,7 +877,8 @@ exit 1
 EOF
 chmod a+x notmuch_fail
 test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
-	       (with-current-buffer \"*Messages*\" (erase-buffer))
+	       (with-current-buffer \"*Messages*\"
+                 (let ((inhibit-read-only t)) (erase-buffer)))
 	       (with-current-buffer (get-buffer-create \"*Notmuch errors*\")
                  (erase-buffer))
 	       (notmuch-search \"tag:inbox\")
@@ -909,7 +910,8 @@ exit 0
 EOF
 chmod a+x notmuch_fail
 test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
-	       (with-current-buffer \"*Messages*\" (erase-buffer))
+	       (with-current-buffer \"*Messages*\"
+                 (let ((inhibit-read-only t)) (erase-buffer)))
 	       (with-current-buffer (get-buffer-create \"*Notmuch errors*\")
                  (erase-buffer))
 	       (notmuch-search \"tag:inbox\")