crypto: fix internal variable/function names for consistency

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 0c5a7447230e9a03bcc692037c91c6529e3d68f3..972c407be579b0347b7f3a4eb90015a8cf6140d3 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -754,7 +754,7 @@ current buffer, if possible."
 (defvar notmuch-show-parent-buffer nil)
 
 ;;;###autoload
-(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name pgpmime-switch)
+(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name crypto-switch)
   "Run \"notmuch show\" with the given thread ID and display results.
 
 The optional PARENT-BUFFER is the notmuch-search buffer from
@@ -774,9 +774,9 @@ function is used. "
   (let ((buffer (get-buffer-create (generate-new-buffer-name
                                    (or buffer-name
                                        (concat "*notmuch-" thread-id "*")))))
-       (pgpmime (if pgpmime-switch
-                    (not notmuch-crypto-process-mime)
-                  notmuch-crypto-process-mime))
+       (process-crypto (if crypto-switch
+                           (not notmuch-crypto-process-mime)
+                         notmuch-crypto-process-mime))
        (inhibit-read-only t))
     (switch-to-buffer buffer)
     (notmuch-show-mode)
@@ -788,13 +788,13 @@ function is used. "
             (args (if query-context
                       (append (list "\'") basic-args (list "and (" query-context ")\'"))
                     (append (list "\'") basic-args (list "\'")))))
-       (notmuch-show-insert-forest (notmuch-query-get-threads args pgpmime))
+       (notmuch-show-insert-forest (notmuch-query-get-threads args process-crypto))
        ;; If the query context reduced the results to nothing, run
        ;; the basic query.
        (when (and (eq (buffer-size) 0)
                   query-context)
          (notmuch-show-insert-forest
-          (notmuch-query-get-threads basic-args pgpmime))))
+          (notmuch-query-get-threads basic-args process-crypto))))
 
       ;; Enable buttonisation of URLs and email addresses in the
       ;; buffer.

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index f21eb6b62b949d88d840224d282e430d37030913..29a0b6d4006a5d693e0c89859291b2257002f8db 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -218,7 +218,7 @@ For a mouse binding, return nil."
     (define-key map "-" 'notmuch-search-remove-tag)
     (define-key map "+" 'notmuch-search-add-tag)
     (define-key map (kbd "RET") 'notmuch-search-show-thread)
-    (define-key map (kbd "M-RET") 'notmuch-search-show-thread-pgpmime-switch)
+    (define-key map (kbd "M-RET") 'notmuch-search-show-thread-crypto-switch)
     map)
   "Keymap for \"notmuch search\" buffers.")
 (fset 'notmuch-search-mode-map notmuch-search-mode-map)
@@ -418,11 +418,11 @@ Complete list of currently available key bindings:
   "Return a list of authors for the current region"
   (notmuch-search-properties-in-region 'notmuch-search-subject beg end))
 
-(defun notmuch-search-show-thread-pgpmime-switch ()
+(defun notmuch-search-show-thread-crypto-switch ()
   (interactive)
   (notmuch-search-show-thread t))
 
-(defun notmuch-search-show-thread (&optional pgpmime-switch)
+(defun notmuch-search-show-thread (&optional crypto-switch)
   "Display the currently selected thread."
   (interactive)
   (let ((thread-id (notmuch-search-find-thread-id))
@@ -439,7 +439,7 @@ Complete list of currently available key bindings:
                                 (truncate-string-to-width subject 32 nil nil t)
                                 "*")
                         32 nil nil t))
-                     pgpmime-switch)
+                     crypto-switch)
       (error "End of search results"))))
 
 (defun notmuch-search-reply-to-thread ()