Merge from gnus--rel--5.10

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index fc61477..ef2e3dd 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,7 +1,7 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sascha Ldecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
@@ -368,11 +368,7 @@ If no one is selected, default secret key is used.  "
       (if mml1991-signers
          (setq signers (mapcar (lambda (name)
                                  (car (epg-list-keys context name t)))
-                               mml1991-signers))
-       (setq signers (list (car (epg-list-keys
-                                 context
-                                 (message-options-get 'mml-sender)
-                                 t))))))
+                               mml1991-signers))))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
     (epg-context-set-signers context signers)
@@ -433,6 +429,7 @@ If no one is selected, default secret key is used.  "
              (message-options-get 'message-recipients)
              "[ \f\t\n\r\v,]+")))
        cipher signers config)
+    ;; We should remove this check if epg-0.0.6 is released.
     (if (and (condition-case nil
                 (require 'epg-config)
               (error))
@@ -460,9 +457,7 @@ If no one is selected, symmetric encryption will be performed.  "
                         (mapcar (lambda (name)
                                   (car (epg-list-keys context name)))
                                 mml1991-signers)))
-         (setq recipients
-               (nconc recipients
-                      (list (car (epg-list-keys context nil t)))))))
+         (error "mml1991-signers not set")))
     (when sign
       (if mml1991-verbose
          (setq signers (epa-select-keys context "Select keys for signing.
@@ -471,11 +466,7 @@ If no one is selected, default secret key is used.  "
        (if mml1991-signers
            (setq signers (mapcar (lambda (name)
                                    (car (epg-list-keys context name t)))
-                                 mml1991-signers))
-         (setq signers (list (car (epg-list-keys
-                                   context
-                                   (message-options-get 'mml-sender)
-                                   t))))))
+                                 mml1991-signers))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)