Re: [PATCH v1 2/3] emacs: Always insert crypto buttons.

2016-04-03 Thread David Edmondson
On Thu, Mar 24 2016, David Bremner  wrote:
> David Edmondson  writes:
>
>> 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.
>
> I'm afraid starting at patch 2 this series needs rebasing against
> master.

An updated patch set is sent trailing along behind
id:1459697903-32673-1-git-send-email-...@dme.org.
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH v1 2/3] emacs: Always insert crypto buttons.

2016-03-24 Thread David Bremner
David Edmondson  writes:

> 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.

I'm afraid starting at patch 2 this series needs rebasing against
master.

d
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


[PATCH v1 2/3] emacs: Always insert crypto buttons.

2016-02-09 Thread David Edmondson
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.
---
 emacs/notmuch-show.el | 29 +++--
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 3345878..4bc5811 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -646,13 +646,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)
   (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 sigstatus, tell the user how they can get it
-(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)))
@@ -667,17 +664,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)
   (button-put button 'face 'notmuch-crypto-part-header)
-  ;; add encryption status button if encstatus specified
-  (if (plist-member part :encstatus)
-  (let ((encstatus (car (plist-get part :encstatus
-   (notmuch-crypto-insert-encstatus-button encstatus)
-   ;; add signature status button if sigstatus 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 encstatus, tell the user how they can get it
-(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.1.4

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch