There are some cases like remote usage where this might cause
problems, but those users can easily customize the variable. The
inconvenience seems to be outweighed by the security benefit for most
users.
---
This version with test suite fixes.
emacs/notmuch-crypto.el | 3 ++-
test/T450-emacs-show.sh | 2 +-
.../notmuch-show-elide-non-matching-messages-off | 6 +++---
.../notmuch-show-elide-non-matching-messages-on | 6 +++---
.../notmuch-show-indent-thread-content-off | 6 +++---
test/emacs.expected-output/notmuch-show-thread-maildir-storage | 8 ++++----
.../notmuch-show-thread-maildir-storage-with-fourfold-indentation | 8 ++++----
.../notmuch-show-thread-maildir-storage-without-indentation | 8 ++++----
test/tree.expected-output/notmuch-tree-show-window | 2 +-
9 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 0af727ef..fc2b5301 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -24,7 +24,7 @@
(require 'epg)
(require 'notmuch-lib)
-(defcustom notmuch-crypto-process-mime nil
+(defcustom notmuch-crypto-process-mime t
"Should cryptographic MIME parts be processed?
If this variable is non-nil signatures in multipart/signed
@@ -40,6 +40,7 @@ providing a prefix when viewing a signed or encrypted message, or
by providing a prefix when reloading the message in notmuch-show
mode."
:type 'boolean
+ :package-version '(notmuch . "0.25")
:group 'notmuch-crypto)
(defface notmuch-crypto-part-header
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index c4bc5ce0..db48c7d5 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -191,7 +191,7 @@ This is an error (see *Notmuch errors* for more details)
=== ERROR ===
[XXX]
This is an error
-command: YYY/notmuch_fail show --format\\=sexp --format-version\\=4 --exclude\\=false \\' \\* \\'
+command: YYY/notmuch_fail show --format\\=sexp --format-version\\=4 --decrypt --exclude\\=false \\' \\* \\'
exit status: 1
stderr:
This is an error
diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off
index 9f1e91f0..e0bd2c73 100644
--- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off
+++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -40,7 +40,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -67,7 +67,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository
diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on
index 118053ba..d76d0952 100644
--- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on
+++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -39,7 +39,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -64,7 +64,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository
diff --git a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
index 2cb12118..1a06374d 100644
--- a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
+++ b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -40,7 +40,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -67,7 +67,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository
diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage
index 35998922..1f89dbef 100644
--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage
+++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -46,7 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0x9D20F6503E338888 or unsupported algorithm ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
@@ -79,7 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -162,7 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository
diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation
index 3bbb114a..5c4ec979 100644
--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation
+++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -46,7 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0x9D20F6503E338888 or unsupported algorithm ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
@@ -79,7 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -165,7 +165,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
- [ Unknown signature status ]
+ [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete)
> fix to my
diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation
index 620caa00..24cdd56e 100644
--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation
+++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
@@ -46,7 +46,7 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0x9D20F6503E338888 or unsupported algorithm ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre
@@ -79,7 +79,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> See the patch just posted here.
@@ -162,7 +162,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository
diff --git a/test/tree.expected-output/notmuch-tree-show-window b/test/tree.expected-output/notmuch-tree-show-window
index ab7205b7..7d860c6f 100644
--- a/test/tree.expected-output/notmuch-tree-show-window
+++ b/test/tree.expected-output/notmuch-tree-show-window
@@ -5,7 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
-[ Unknown signature status ]
+[ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ]
[ text/plain ]
I saw the LWN article and decided to take a look at notmuch. I'm
currently using mutt and mairix to index and read a collection of
--
2.13.2