Require cl, mm-util when compiling.

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 63903d7..045dbdd 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -26,6 +26,13 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl)
+  (require 'mm-util))
+
+(autoload 'quoted-printable-decode-region "qp")
+(autoload 'quoted-printable-encode-region "qp")
+
 (defvar mml1991-use mml2015-use
   "The package used for PGP.")
 
@@ -62,7 +69,7 @@
     (quoted-printable-decode-region (point-min) (point-max))
     (with-temp-buffer
       (setq signature (current-buffer))
-      (insert-buffer text)
+      (insert-buffer-substring text)
       (unless (mc-sign-generic (message-options-get 'message-sender)
                               nil nil nil nil)
        (unless (> (point-max) (point-min))
@@ -76,7 +83,7 @@
       (delete-region (point-min) (point-max))
       (if headers (insert headers))
       (insert "\n")
-      (insert-buffer signature)
+      (insert-buffer-substring signature)
       (goto-char (point-max)))))
 
 (defun mml1991-mailcrypt-encrypt (cont &optional sign)
@@ -100,7 +107,7 @@
     (mm-with-unibyte-current-buffer-mule4
       (with-temp-buffer
        (setq cipher (current-buffer))
-       (insert-buffer text)
+       (insert-buffer-substring text)
        (unless (mc-encrypt-generic
                 (or
                  (message-options-get 'message-recipients)
@@ -121,7 +128,7 @@
        ;;(insert "Content-Type: application/pgp-encrypted\n\n")
        ;;(insert "Version: 1\n\n")
        (insert "\n")
-       (insert-buffer cipher)
+       (insert-buffer-substring cipher)
        (goto-char (point-max))))))
 
 ;;; gpg wrapper
@@ -159,7 +166,7 @@
       (delete-region (point-min) (point-max))
       (if headers (insert headers))
       (insert "\n")
-      (insert-buffer signature)
+      (insert-buffer-substring signature)
       (goto-char (point-max)))))
 
 (defun mml1991-gpg-encrypt (cont &optional sign)
@@ -207,7 +214,7 @@
        ;;(insert "Content-Type: application/pgp-encrypted\n\n")
        ;;(insert "Version: 1\n\n")
        (insert "\n")
-       (insert-buffer cipher)
+       (insert-buffer-substring cipher)
        (goto-char (point-max))))))
 
 ;; pgg wrapper
@@ -233,7 +240,7 @@
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
     (delete-region (point-min) (point-max))
-    (insert-buffer pgg-output-buffer)
+    (insert-buffer-substring pgg-output-buffer)
     (goto-char (point-min))
     (while (re-search-forward "\r+$" nil t)
       (replace-match "" t t))
@@ -265,7 +272,7 @@
     ;;(insert "Content-Type: application/pgp-encrypted\n\n")
     ;;(insert "Version: 1\n\n")
     (insert "\n")
-    (insert-buffer pgg-output-buffer)
+    (insert-buffer-substring pgg-output-buffer)
     t))
 
 ;;;###autoload