* mime-pgp.el: When it is compiled, define `smime-output-buffer'

and `smime-errors-buffer' to avoid compiler warning.

* mime-edit.el: Ditto.

diff --git a/mime-edit.el b/mime-edit.el
index 94cc53f..bf2b552 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -128,6 +128,8 @@
   "S/MIME encryption of current region.")
 (autoload 'smime-sign-region "smime"
   "S/MIME signature of current region.")
+(defvar smime-output-buffer)
+(defvar smime-errors-buffer)
 
 
 ;;; @ version
@@ -1762,6 +1764,8 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
          (replace-match (concat "-" (substring tag 2)))
          )))))
 
+(defvar mime-edit-pgp-user-id nil)
+
 (defun mime-edit-sign-pgp-mime (beg end boundary)
   (save-excursion
     (save-restriction
@@ -2512,8 +2516,6 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
 (defvar mime-edit-pgp-processing nil)
 (make-variable-buffer-local 'mime-edit-pgp-processing)
 
-(defvar mime-edit-pgp-user-id nil)
-
 (defun mime-edit-set-sign (arg)
   (interactive
    (list

diff --git a/mime-pgp.el b/mime-pgp.el
index 7bfdb61..d3d66e1 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -61,6 +61,8 @@
   "S/MIME decryption of current region.")
 (autoload 'smime-verify-region "smime"
   "S/MIME verification of current region.")
+(defvar smime-output-buffer)
+(defvar smime-errors-buffer)
 
 
 ;;; @ Internal method for multipart/signed
@@ -251,7 +253,7 @@
          (format "%s-%s" (buffer-name) (mime-entity-number entity)))
         (mother (current-buffer))
         (preview-buffer (concat "*Preview-" (buffer-name) "*")))
-    (when (memq (or (cdr (assq 'smime-type situation)) enveloped-data)
+    (when (memq (or (cdr (assq 'smime-type situation)) 'enveloped-data)
                '(enveloped-data signed-data))
       (set-buffer (get-buffer-create new-name))
       (let ((inhibit-read-only t)