Synch to No Gnus 200506160601, and

[elisp/gnus.git-] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 43276f0..6239282 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1,5 +1,6 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
@@ -87,7 +88,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
     ("TRUST_FULLY"     . t)
     ("TRUST_ULTIMATE"  . t))
   "Map GnuPG trust output values to a boolean saying if you trust the key."
-  :version "21.4"
+  :version "22.1"
   :group 'mime-security
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
@@ -636,6 +637,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
 ;;; pgg wrapper
 
 (eval-when-compile
+  (defvar pgg-default-user-id)
   (defvar pgg-errors-buffer)
   (defvar pgg-output-buffer))