(mml1991-pgg-sign): Insert pgg output as unibyte.

[gnus] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 271e672..506a3b1 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,11 +1,11 @@
-;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;     Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
 ;; Keywords PGP
 
-;; This file is (not yet) part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; 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
@@ -24,10 +24,15 @@
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 6.16 2002/10/11 00:02:24 jas Exp $
-
 ;;; 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.")
 
@@ -55,17 +60,16 @@
     ;; Save MIME Content[^ ]+: headers from signing
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
-    (if (> (point) (point-min))
-       (progn
-         (setq headers (buffer-string))
-         (kill-region (point-min) (point))))
+    (unless (bobp)
+      (setq headers (buffer-string))
+      (delete-region (point-min) (point)))
     (goto-char (point-max))
     (unless (bolp)
       (insert "\n"))
     (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,10 +80,10 @@
        (replace-match "" t t))
       (quoted-printable-encode-region (point-min) (point-max))
       (set-buffer text)
-      (kill-region (point-min) (point-max))
+      (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)
@@ -98,13 +102,12 @@
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
-    (if (> (point) (point-min))
-       (progn
-         (kill-region (point-min) (point))))
-    (mm-with-unibyte-current-buffer-mule4
+    (unless (bobp)
+      (delete-region (point-min) (point)))
+    (mm-with-unibyte-current-buffer
       (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,11 +124,11 @@
        (while (re-search-forward "\r+$" nil t)
          (replace-match "" t t))
        (set-buffer text)
-       (kill-region (point-min) (point-max))
+       (delete-region (point-min) (point-max))
        ;;(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
@@ -140,10 +143,9 @@
     ;; Save MIME Content[^ ]+: headers from signing
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
-    (if (> (point) (point-min))
-       (progn
-         (setq headers (buffer-string))
-         (kill-region (point-min) (point))))
+    (unless (bobp)
+      (setq headers (buffer-string))
+      (delete-region (point-min) (point)))
     (goto-char (point-max))
     (unless (bolp)
       (insert "\n"))
@@ -161,10 +163,10 @@
        (replace-match "" t t))
       (quoted-printable-encode-region (point-min) (point-max))
       (set-buffer text)
-      (kill-region (point-min) (point-max))
+      (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)
@@ -174,10 +176,9 @@
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
-    (if (> (point) (point-min))
-       (progn
-         (kill-region (point-min) (point))))
-    (mm-with-unibyte-current-buffer-mule4
+    (unless (bobp)
+      (delete-region (point-min) (point)))
+    (mm-with-unibyte-current-buffer
       (with-temp-buffer
        (flet ((gpg-encrypt-func 
                (sign plaintext ciphertext result recipients &optional
@@ -209,11 +210,11 @@
        (while (re-search-forward "\r+$" nil t)
          (replace-match "" t t))
        (set-buffer text)
-       (kill-region (point-min) (point-max))
+       (delete-region (point-min) (point-max))
        ;;(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
@@ -230,16 +231,17 @@
     (unless (eobp) ;; no headers?
       (setq headers (buffer-substring (point-min) (point)))
       (forward-line) ;; skip header/body separator
-      (kill-region (point-min) (point)))
+      (delete-region (point-min) (point)))
     (quoted-printable-decode-region (point-min) (point-max))
     (unless (let ((pgg-default-user-id
-                  (or (message-options-get 'message-sender)
+                  (or (message-options-get 'mml-sender)
                       pgg-default-user-id)))
              (pgg-sign-region (point-min) (point-max) t))
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
-    (kill-region (point-min) (point-max))
-    (insert-buffer pgg-output-buffer)
+    (delete-region (point-min) (point-max))
+    (mm-with-unibyte-current-buffer
+      (insert-buffer-substring pgg-output-buffer))
     (goto-char (point-min))
     (while (re-search-forward "\r+$" nil t)
       (replace-match "" t t))
@@ -254,9 +256,8 @@
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
-    (if (> (point) (point-min))
-       (progn
-         (kill-region (point-min) (point))))
+    (unless (bobp)
+      (delete-region (point-min) (point)))
     (unless (pgg-encrypt-region
             (point-min) (point-max) 
             (split-string
@@ -268,11 +269,11 @@
             sign)
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
-    (kill-region (point-min) (point-max))
+    (delete-region (point-min) (point-max))
     ;;(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