version: bump to 0.15.1

[notmuch] / emacs / notmuch-crypto.el

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 096dc5ecb742d9f2c81e7a952a7bfc8e463a081c..83e5d37aa4a939fbe366076f8d7b16c3b698685a 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -31,38 +31,50 @@ on the success or failure of the verification process and on the
 validity of user ID of the signer.
 
 The effect of setting this variable can be seen temporarily by
 validity of user ID of the signer.
 
 The effect of setting this variable can be seen temporarily by

-viewing a signed or encrypted message with M-RET in notmuch
-search."
-  :group 'notmuch
-  :type 'boolean)
+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
+  :group 'notmuch-crypto)
+
+(defface notmuch-crypto-part-header
+  '((t (:foreground "blue")))
+  "Face used for crypto parts headers."
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (defface notmuch-crypto-signature-good
   '((t (:background "green" :foreground "black")))
   "Face used for good signatures."
 
 (defface notmuch-crypto-signature-good
   '((t (:background "green" :foreground "black")))
   "Face used for good signatures."

-  :group 'notmuch)
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (defface notmuch-crypto-signature-good-key
   '((t (:background "orange" :foreground "black")))
   "Face used for good signatures."
 
 (defface notmuch-crypto-signature-good-key
   '((t (:background "orange" :foreground "black")))
   "Face used for good signatures."

-  :group 'notmuch)
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (defface notmuch-crypto-signature-bad
   '((t (:background "red" :foreground "black")))
   "Face used for bad signatures."
 
 (defface notmuch-crypto-signature-bad
   '((t (:background "red" :foreground "black")))
   "Face used for bad signatures."

-  :group 'notmuch)
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (defface notmuch-crypto-signature-unknown
   '((t (:background "red" :foreground "black")))
   "Face used for signatures of unknown status."
 
 (defface notmuch-crypto-signature-unknown
   '((t (:background "red" :foreground "black")))
   "Face used for signatures of unknown status."

-  :group 'notmuch)
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (defface notmuch-crypto-decryption
   '((t (:background "purple" :foreground "black")))
   "Face used for encryption/decryption status messages."
 
 (defface notmuch-crypto-decryption
   '((t (:background "purple" :foreground "black")))
   "Face used for encryption/decryption status messages."

-  :group 'notmuch)
+  :group 'notmuch-crypto
+  :group 'notmuch-faces)

 
 (define-button-type 'notmuch-crypto-status-button-type
 
 (define-button-type 'notmuch-crypto-status-button-type

-  'action '(lambda (button) (message (button-get button 'help-echo)))
+  'action (lambda (button) (message (button-get button 'help-echo)))

   'follow-link t
   'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")
 
   'follow-link t
   'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")
 


@@ -71,7 +83,7 @@ search."
         (help-msg nil)
         (label "Signature not processed")
         (face 'notmuch-crypto-signature-unknown)
         (help-msg nil)
         (label "Signature not processed")
         (face 'notmuch-crypto-signature-unknown)

-        (button-action '(lambda (button) (message (button-get button 'help-echo)))))
+        (button-action (lambda (button) (message (button-get button 'help-echo)))))

     (cond
      ((string= status "good")
       (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))
     (cond
      ((string= status "good")
       (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))


@@ -89,7 +101,7 @@ search."
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
        (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
        (setq button-action 'notmuch-crypto-sigstatus-error-callback)
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
        (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
        (setq button-action 'notmuch-crypto-sigstatus-error-callback)

-       (setq help-msg (concat "Click to retreive key ID " keyid " from keyserver and redisplay."))))
+       (setq help-msg (concat "Click to retrieve key ID " keyid " from keyserver and redisplay."))))

      ((string= status "bad")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
        (setq label (concat "Bad signature (claimed key ID " keyid ")"))
      ((string= status "bad")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
        (setq label (concat "Bad signature (claimed key ID " keyid ")"))


@@ -108,7 +120,7 @@ search."
      :notmuch-from from)
     (insert "\n")))
 
      :notmuch-from from)
     (insert "\n")))
 

-(declare-function notmuch-show-refresh-view "notmuch-show" (&optional crypto-switch))
+(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))

 
 (defun notmuch-crypto-sigstatus-good-callback (button)
   (let* ((sigstatus (button-get button :notmuch-sigstatus))
 
 (defun notmuch-crypto-sigstatus-good-callback (button)
   (let* ((sigstatus (button-get button :notmuch-sigstatus))


@@ -117,6 +129,7 @@ search."
         (window (display-buffer buffer t nil)))
     (with-selected-window window
       (with-current-buffer buffer
         (window (display-buffer buffer t nil)))
     (with-selected-window window
       (with-current-buffer buffer

+       (goto-char (point-max))

        (call-process "gpg" nil t t "--list-keys" fingerprint))
       (recenter -1))))
 
        (call-process "gpg" nil t t "--list-keys" fingerprint))
       (recenter -1))))
 


@@ -127,6 +140,7 @@ search."
         (window (display-buffer buffer t nil)))
     (with-selected-window window
       (with-current-buffer buffer
         (window (display-buffer buffer t nil)))
     (with-selected-window window
       (with-current-buffer buffer

+       (goto-char (point-max))

        (call-process "gpg" nil t t "--recv-keys" keyid)
        (insert "\n")
        (call-process "gpg" nil t t "--list-keys" keyid))
        (call-process "gpg" nil t t "--recv-keys" keyid)
        (insert "\n")
        (call-process "gpg" nil t t "--list-keys" keyid))