(nntp-wait-for-string): Supply a timeout for accept-process-output to ensure progress.

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 44efe6d..8f9076c 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,28 +1,26 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   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
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -30,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)
@@ -81,8 +84,7 @@ Whether the passphrase is cached at all is controlled by
 
 ;;; mailcrypt wrapper
 
-(eval-and-compile
-  (autoload 'mc-sign-generic "mc-toplev"))
+(autoload 'mc-sign-generic "mc-toplev")
 
 (defvar mml1991-decrypt-function 'mailcrypt-decrypt)
 (defvar mml1991-verify-function 'mailcrypt-verify)
@@ -136,13 +138,14 @@ Whether the passphrase is cached at all is controlled by
             'never))
        cipher
        (result-buffer (get-buffer-create "*GPG Result*")))
-    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
+    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (unless (bobp)
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+       (inline (mm-disable-multibyte))
        (setq cipher (current-buffer))
        (insert-buffer-substring text)
        (unless (mc-encrypt-generic
@@ -170,8 +173,7 @@ Whether the passphrase is cached at all is controlled by
 
 ;;; gpg wrapper
 
-(eval-and-compile
-  (autoload 'gpg-sign-cleartext "gpg"))
+(autoload 'gpg-sign-cleartext "gpg")
 
 (declare-function gpg-sign-encrypt "ext:gpg"
                   (plaintext ciphertext result recipients &optional
@@ -217,13 +219,14 @@ Whether the passphrase is cached at all is controlled by
   (let ((text (current-buffer))
        cipher
        (result-buffer (get-buffer-create "*GPG Result*")))
-    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
+    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (unless (bobp)
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+       (inline (mm-disable-multibyte))
        (flet ((gpg-encrypt-func
                (sign plaintext ciphertext result recipients &optional
                      passphrase sign-with-key armor textmode)
@@ -307,7 +310,7 @@ Whether the passphrase is cached at all is controlled by
     (let ((cte (save-restriction
                 (narrow-to-region (point-min) (point))
                 (mail-fetch-field "content-transfer-encoding"))))
-      ;; Strip MIME headers since it will be ASCII armoured.
+      ;; Strip MIME headers since it will be ASCII armored.
       (forward-line 1)
       (delete-region (point-min) (point))
       (when cte
@@ -332,21 +335,19 @@ Whether the passphrase is cached at all is controlled by
 ;; epg wrapper
 
 (defvar epg-user-id-alist)
-(defvar password-cache-expiry)
 
-(eval-and-compile
-  (autoload 'epg-make-context "epg")
-  (autoload 'epg-passphrase-callback-function "epg")
-  (autoload 'epa-select-keys "epa")
-  (autoload 'epg-list-keys "epg")
-  (autoload 'epg-context-set-armor "epg")
-  (autoload 'epg-context-set-textmode "epg")
-  (autoload 'epg-context-set-signers "epg")
-  (autoload 'epg-context-set-passphrase-callback "epg")
-  (autoload 'epg-sign-string "epg")
-  (autoload 'epg-encrypt-string "epg")
-  (autoload 'epg-configuration "epg-config")
-  (autoload 'epg-expand-group "epg-config"))
+(autoload 'epg-make-context "epg")
+(autoload 'epg-passphrase-callback-function "epg")
+(autoload 'epa-select-keys "epa")
+(autoload 'epg-list-keys "epg")
+(autoload 'epg-context-set-armor "epg")
+(autoload 'epg-context-set-textmode "epg")
+(autoload 'epg-context-set-signers "epg")
+(autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-sign-string "epg")
+(autoload 'epg-encrypt-string "epg")
+(autoload 'epg-configuration "epg-config")
+(autoload 'epg-expand-group "epg-config")
 
 (defvar mml1991-epg-secret-key-id-list nil)
 
@@ -373,7 +374,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))
@@ -429,7 +430,7 @@ If no one is selected, default secret key is used.  "
     (let ((cte (save-restriction
                 (narrow-to-region (point-min) (point))
                 (mail-fetch-field "content-transfer-encoding"))))
-      ;; Strip MIME headers since it will be ASCII armoured.
+      ;; Strip MIME headers since it will be ASCII armored.
       (forward-line 1)
       (delete-region (point-min) (point))
       (when cte
@@ -453,7 +454,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.  "
@@ -471,7 +472,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))
@@ -520,5 +521,4 @@ If no one is selected, default secret key is used.  "
 ;; coding: iso-8859-1
 ;; End:
 
-;;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706
 ;;; mml1991.el ends here