(spam-report-gmane-max-requests): New constant.

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index fc61477..89878ce 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,33 +1,35 @@
 ;;; 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.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008  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 2, 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:
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-when-compile
   (require 'cl)
   (require 'mm-util))
@@ -39,6 +41,11 @@
 (autoload 'quoted-printable-decode-region "qp")
 (autoload 'quoted-printable-encode-region "qp")
 
+(autoload 'mm-decode-content-transfer-encoding "mm-bodies")
+(autoload 'mm-encode-content-transfer-encoding "mm-bodies")
+(autoload 'message-options-get "message")
+(autoload 'message-options-set "message")
+
 (defvar mml1991-use mml2015-use
   "The package used for PGP.")
 
@@ -72,8 +79,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)
@@ -111,6 +117,9 @@ Whether the passphrase is cached at all is controlled by
       (insert-buffer-substring signature)
       (goto-char (point-max)))))
 
+(declare-function mc-encrypt-generic "ext:mc-toplev"
+                  (&optional recipients scheme start end from sign))
+
 (defun mml1991-mailcrypt-encrypt (cont &optional sign)
   (let ((text (current-buffer))
        (mc-pgp-always-sign
@@ -124,7 +133,7 @@ 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)
@@ -158,8 +167,14 @@ 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
+                             passphrase sign-with-key armor textmode))
+(declare-function gpg-encrypt "ext:gpg"
+                  (plaintext ciphertext result recipients &optional
+                             passphrase armor textmode))
 
 (defun mml1991-gpg-sign (cont)
   (let ((text (current-buffer))
@@ -198,7 +213,7 @@ 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)
@@ -244,10 +259,9 @@ Whether the passphrase is cached at all is controlled by
 
 ;; pgg wrapper
 
-(eval-when-compile
-  (defvar pgg-default-user-id)
-  (defvar pgg-errors-buffer)
-  (defvar pgg-output-buffer))
+(defvar pgg-default-user-id)
+(defvar pgg-errors-buffer)
+(defvar pgg-output-buffer)
 
 (defun mml1991-pgg-sign (cont)
   (let ((pgg-text-mode t)
@@ -289,7 +303,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
@@ -313,28 +327,21 @@ Whether the passphrase is cached at all is controlled by
 
 ;; epg wrapper
 
-(eval-and-compile
-  (autoload 'epg-make-context "epg"))
-
-(eval-when-compile
-  (defvar epg-user-id-alist)
-  (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"))
-
-(eval-when-compile
-  (defvar password-cache-expiry)
-  (autoload 'password-read "password")
-  (autoload 'password-cache-add "password")
-  (autoload 'password-cache-remove "password"))
+(defvar epg-user-id-alist)
+(defvar password-cache-expiry)
+
+(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)
 
@@ -368,11 +375,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)
@@ -421,7 +424,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
@@ -433,6 +436,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 +464,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 +473,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)
@@ -517,5 +515,5 @@ If no one is selected, default secret key is used.  "
 ;; coding: iso-8859-1
 ;; End:
 
-;;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706
+;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706
 ;;; mml1991.el ends here