(mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system if set.

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 4536f41..a3ada29 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,
-;;   2007, 2008, 2009  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
@@ -28,12 +28,17 @@
 
 ;; For Emacs < 22.2.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+
+  (if (locate-library "password-cache")
+      (require 'password-cache)
+    (require 'password)))
 
 (eval-when-compile
   (require 'cl)
   (require 'mm-util))
 
+(require 'mm-encode)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
@@ -328,7 +333,6 @@ Whether the passphrase is cached at all is controlled by
 ;; epg wrapper
 
 (defvar epg-user-id-alist)
-(defvar password-cache-expiry)
 
 (autoload 'epg-make-context "epg")
 (autoload 'epg-passphrase-callback-function "epg")
@@ -368,7 +372,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 +452,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 +470,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))