Synch to Oort Gnus 200304162310.

[elisp/gnus.git-] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 2aa99b5..7a4d763 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -382,7 +382,7 @@
               (buffer-string)))
            (set-buffer cipher)
            (erase-buffer)
-           (insert-buffer plain)
+           (insert-buffer-substring plain)
            (goto-char (point-min))
            (while (search-forward "\r\n" nil t)
              (replace-match "\n" t t))))
@@ -572,7 +572,7 @@
       (goto-char (point-max))
       (insert (format "\n--%s\n" boundary))
       (insert "Content-Type: application/pgp-signature\n\n")
-      (insert-buffer signature)
+      (insert-buffer-substring signature)
       (goto-char (point-max))
       (insert (format "--%s--\n" boundary))
       (goto-char (point-max)))))
@@ -626,7 +626,7 @@
        (insert "Version: 1\n\n")
        (insert (format "--%s\n" boundary))
        (insert "Content-Type: application/octet-stream\n\n")
-       (insert-buffer cipher)
+       (insert-buffer-substring cipher)
        (goto-char (point-max))
        (insert (format "--%s--\n" boundary))
        (goto-char (point-max))))))
@@ -703,7 +703,7 @@
             (buffer-string))))
        (progn
          (erase-buffer)
-         (insert-buffer pgg-output-buffer)
+         (insert-buffer-substring pgg-output-buffer)
          (goto-char (point-min))
          (while (search-forward "\r\n" nil t)
            (replace-match "\n" t t))
@@ -807,7 +807,9 @@
 
 (defun mml2015-pgg-sign (cont)
   (let ((pgg-errors-buffer mml2015-result-buffer)
-       (boundary (funcall mml-boundary-function (incf mml-multipart-number))))
+       (boundary (funcall mml-boundary-function (incf mml-multipart-number)))
+       (pgg-default-user-id (or (message-options-get 'message-sender)
+                                pgg-default-user-id)))
     (unless (pgg-sign-region (point-min) (point-max))
       (pop-to-buffer mml2015-result-buffer)
       (error "Sign error"))
@@ -820,7 +822,7 @@
     (goto-char (point-max))
     (insert (format "\n--%s\n" boundary))
     (insert "Content-Type: application/pgp-signature\n\n")
-    (insert-buffer pgg-output-buffer)
+    (insert-buffer-substring pgg-output-buffer)
     (goto-char (point-max))
     (insert (format "--%s--\n" boundary))
     (goto-char (point-max))))
@@ -848,7 +850,7 @@
     (insert "Version: 1\n\n")
     (insert (format "--%s\n" boundary))
     (insert "Content-Type: application/octet-stream\n\n")
-    (insert-buffer pgg-output-buffer)
+    (insert-buffer-substring pgg-output-buffer)
     (goto-char (point-max))
     (insert (format "--%s--\n" boundary))
     (goto-char (point-max))))