Add 2010 to copyright years.

[gnu-emacs] / lisp / gnus / mml1991.el

diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 60d6e3cb4fd605d845a3f76c93d066145d708ca8..c523dccc05564ec8995b6e5d70f57c364a4cb740 100644 (file)
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -1,9 +1,9 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
-;; Author: Sascha Ldecke <sascha@meta-x.de>,
+;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
 ;; Keywords PGP
 
@@ -34,6 +34,7 @@
   (require 'cl)
   (require 'mm-util))
 
+(require 'mm-encode)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
@@ -368,7 +369,7 @@ Whether the passphrase is cached at all is controlled by
 (defun mml1991-epg-sign (cont)
   (let ((context (epg-make-context))
        headers cte signers signature)
-    (if mml1991-verbose
+    (if (eq mm-sign-option 'guided)
        (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                       mml1991-signers t))
@@ -448,7 +449,7 @@ If no one is selected, default secret key is used.  "
                               (or (epg-expand-group config recipient)
                                   (list recipient)))
                             recipients))))
-    (if mml1991-verbose
+    (if (eq mm-encrypt-option 'guided)
        (setq recipients
              (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
@@ -466,7 +467,7 @@ If no one is selected, symmetric encryption will be performed.  "
                                 mml1991-signers)))
          (error "mml1991-signers not set")))
     (when sign
-      (if mml1991-verbose
+      (if (eq mm-sign-option 'guided)
          (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                         mml1991-signers t))