debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Always insert crypto buttons.

Browse source 
When no decryption or signature examination is
happening (i.e. `notmuch-crypto-process-mime' is `nil') insert buttons
that indicate this, rather than remaining silent.
This commit is contained in:
David Edmondson 2016-04-03 16:38:22 +01:00 committed by David Bremner
parent f0881394bd
commit f8effea9a3
10 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
emacs/notmuch-show.el
View file

@ -642,15 +642,10 @@ will return nil if the CID is unknown or cannot be retrieved."
(defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth button)
(when button
(button-put button 'face 'notmuch-crypto-part-header))
;; Add signature status button if sigstatus provided.
(if (plist-member part :sigstatus)
(let* ((from (notmuch-show-get-header :From msg))
(sigstatus (car (plist-get part :sigstatus))))
(notmuch-crypto-insert-sigstatus-button sigstatus from))
;; If we're not adding the signature status, tell the user how
;; they can get it.
(when button
(button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))
;; Insert a button detailing the signature status.
(notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
(notmuch-show-get-header :From msg))
(let ((inner-parts (plist-get part :content))
(start (point)))
@ -666,20 +661,13 @@ will return nil if the CID is unknown or cannot be retrieved."
(defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button)
(when button
(button-put button 'face 'notmuch-crypto-part-header))
;; Add encryption status button if encryption status is specified.
(if (plist-member part :encstatus)
(let ((encstatus (car (plist-get part :encstatus))))
(notmuch-crypto-insert-encstatus-button encstatus)
;; Add signature status button if signature status is
;; specified.
(if (plist-member part :sigstatus)
(let* ((from (notmuch-show-get-header :From msg))
(sigstatus (car (plist-get part :sigstatus))))
(notmuch-crypto-insert-sigstatus-button sigstatus from))))
;; If we're not adding the encryption status, tell the user how
;; they can get it.
(when button
(button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))
;; Insert a button detailing the encryption status.
(notmuch-crypto-insert-encstatus-button (car (plist-get part :encstatus)))
;; Insert a button detailing the signature status.
(notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
(notmuch-show-get-header :From msg))
(let ((inner-parts (plist-get part :content))
(start (point)))

2
test/T310-emacs.sh
View file

@ -394,6 +394,8 @@ User-Agent: Notmuch/XXX Emacs/XXX
--text follows this line--
Adrian Perez de Castro <aperez@igalia.com> writes:
> [ Unknown signature status ]
>
> Hello to all,
>
> I have just heard about Not Much today in some random Linux-related news

3
test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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,6 +40,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -65,6 +67,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

3
test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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
@ -38,6 +39,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -62,6 +64,7 @@ Cheers,
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

3
test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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,6 +40,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -65,6 +67,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

1
test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off
View file

@ -9,6 +9,7 @@ Subject: [notmuch] Working with Maildir storage?
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.

4
test/emacs.expected-output/notmuch-show-thread-maildir-storage
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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
@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

4
test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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
@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

4
test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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
@ -45,6 +46,7 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
@ -77,6 +79,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> See the patch just posted here.
@ -159,6 +162,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ text/plain ]
> I've also pushed a slightly more complicated (and complete) fix to my
> private notmuch repository

1
test/tree.expected-output/notmuch-tree-show-window
View file

@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500
[ multipart/mixed ]
[ multipart/signed ]
[ Unknown signature status ]
[ 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