[Emacs-diffs] Changes to emacs/lisp/gnus/mml1991.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/11 05:28:13

Index: mml1991.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/mml1991.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- mml1991.el  4 Dec 2007 04:05:17 -0000       1.15
+++ mml1991.el  11 Dec 2007 05:28:13 -0000      1.16
@@ -28,6 +28,10 @@
 
 ;;; 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 +43,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.")
 
@@ -111,6 +120,9 @@
       (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
@@ -161,6 +173,13 @@
 (eval-and-compile
   (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))
        headers signature