2003-12-31 Jeremy Maitin-Shepard <jbms@attbi.com>

	* mml.el (mml-generate-mime-1): Use mml-compute-boundary (tiny
	change).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb3b4c8..9d9ed67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-31  Jeremy Maitin-Shepard  <jbms@attbi.com>
+
+       * mml.el (mml-generate-mime-1): Use mml-compute-boundary (tiny
+       change). 
+
 2003-12-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-group.el: Removed `(when t ...)' around `gnus-define-keys'.

diff --git a/lisp/mml.el b/lisp/mml.el
index 7128da4..578390c 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -430,8 +430,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                                       (+ (match-beginning 0) 3))))))
                  (cond
                   ((eq (car cont) 'mml)
-                   (let ((mml-boundary (funcall mml-boundary-function
-                                                (incf mml-multipart-number)))
+                   (let ((mml-boundary (mml-compute-boundary cont)))
                          (mml-generate-default-type "text/plain"))
                      (mml-to-mime))
                    (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index fc3cc50..13a4a4d 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -277,8 +277,7 @@
 (defun mml2015-mailcrypt-sign (cont)
   (mc-sign-generic (message-options-get 'message-sender)
                   nil nil nil nil)
-  (let ((boundary
-        (funcall mml-boundary-function (incf mml-multipart-number)))
+  (let ((boundary (mml-compute-boundary cont))
        hash point)
     (goto-char (point-min))
     (unless (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\r?$" nil t)
@@ -341,8 +340,7 @@
   (goto-char (point-min))
   (unless (looking-at "-----BEGIN PGP MESSAGE-----")
     (error "Fail to encrypt the message"))
-  (let ((boundary
-        (funcall mml-boundary-function (incf mml-multipart-number))))
+  (let ((boundary (mml-compute-boundary cont)))
     (insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
                    boundary))
     (insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
@@ -544,8 +542,7 @@
      mm-security-handle 'gnus-info "Failed")))
 
 (defun mml2015-gpg-sign (cont)
-  (let ((boundary
-        (funcall mml-boundary-function (incf mml-multipart-number)))
+  (let ((boundary (mml-compute-boundary cont))
        (text (current-buffer)) signature)
     (goto-char (point-max))
     (unless (bolp)
@@ -578,8 +575,7 @@
       (goto-char (point-max)))))
 
 (defun mml2015-gpg-encrypt (cont &optional sign)
-  (let ((boundary
-        (funcall mml-boundary-function (incf mml-multipart-number)))
+  (let ((boundary (mml-compute-boundary cont))
        (text (current-buffer))
        cipher)
     (mm-with-unibyte-current-buffer
@@ -807,7 +803,7 @@
 
 (defun mml2015-pgg-sign (cont)
   (let ((pgg-errors-buffer mml2015-result-buffer)
-       (boundary (funcall mml-boundary-function (incf mml-multipart-number)))
+       (boundary (mml-compute-boundary cont))
        (pgg-default-user-id (or (message-options-get 'mml-sender)
                                 pgg-default-user-id)))
     (unless (pgg-sign-region (point-min) (point-max))
@@ -829,7 +825,7 @@
 
 (defun mml2015-pgg-encrypt (cont &optional sign)
   (let ((pgg-errors-buffer mml2015-result-buffer)
-       (boundary (funcall mml-boundary-function (incf mml-multipart-number))))
+       (boundary (mml-compute-boundary cont)))
     (unless (pgg-encrypt-region (point-min) (point-max)
                                (split-string
                                 (or