From 1d449b19d62f8284134d25c25fdbd831d971ff4c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 7 Apr 2003 08:43:35 +0000 Subject: [PATCH] Synch to Oort Gnus 200304070816. --- lisp/ChangeLog | 24 ++++++++++++++++++++++++ lisp/mm-extern.el | 2 +- lisp/mm-view.el | 2 +- lisp/mml-smime.el | 2 +- lisp/mml.el | 4 ++-- lisp/mml1991.el | 16 ++++++++-------- lisp/mml2015.el | 12 ++++++------ 7 files changed, 43 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34369a8..b2c566f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,27 @@ +2003-04-07 Jesper Harder + + * gnus-art.el (article-verify-x-pgp-sig): Don't use + `insert-buffer', the docstring says "This function is meant for + the user to run interactively. Don't call it from programs!" + + * mm-extern.el (mm-extern-mail-server): do. + + * mml1991.el (mml1991-mailcrypt-sign, mml1991-mailcrypt-sign) + (mml1991-gpg-sign, mml1991-gpg-encrypt, mml1991-pgg-sign) + (mml1991-pgg-encrypt): do. + + * pgg.el (pgg-decrypt-region): do. + + * mm-view.el (mm-view-pkcs7-decrypt): do. + + * mml-smime.el (mml-smime-verify): do. + + * mml.el (mml-insert-mime, mml-preview): do. + + * mml2015.el (mml2015-gpg-decrypt-1, mml2015-gpg-sign) + (mml2015-gpg-encrypt, mml2015-pgg-clear-decrypt) + (mml2015-pgg-encrypt): do. + 2003-04-06 Katsumi Yamaoka * mm-bodies.el (mm-decode-body): Silence XEmacs when compiling. diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el index fef89ca..5224a88 100644 --- a/lisp/mm-extern.el +++ b/lisp/mm-extern.el @@ -98,7 +98,7 @@ (message-mail server subject) (message-goto-body) (delete-region (point) (point-max)) - (insert-buffer buf) + (insert-buffer-substring buf) (message "Requesting external body...") (message-send-and-exit) (setq info "Request is sent.") diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 5425a69..2a6f9ed 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -559,7 +559,7 @@ map."))) t) (defun mm-view-pkcs7-decrypt (handle) - (insert-buffer (mm-handle-buffer handle)) + (insert-buffer-substring (mm-handle-buffer handle)) (goto-char (point-min)) (insert "MIME-Version: 1.0\n") (mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m") diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el index 2eec919..5939b08 100644 --- a/lisp/mml-smime.el +++ b/lisp/mml-smime.el @@ -125,7 +125,7 @@ (defun mml-smime-verify (handle ctl) (with-temp-buffer - (insert-buffer (mm-handle-multipart-original-buffer ctl)) + (insert-buffer-substring (mm-handle-multipart-original-buffer ctl)) (goto-char (point-min)) (insert (format "Content-Type: %s; " (mm-handle-media-type ctl))) (insert (format "protocol=\"%s\"; " diff --git a/lisp/mml.el b/lisp/mml.el index d35cb8c..35e279e 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -738,7 +738,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (mml-insert-mml-markup handle buffer textp))) (cond (mmlp - (insert-buffer buffer) + (insert-buffer-substring buffer) (goto-char (point-max)) (insert "<#/mml>\n")) ((stringp (car handle)) @@ -1039,7 +1039,7 @@ If RAW, don't highlight the article." (concat (if raw "*Raw MIME preview of " "*MIME preview of ") (buffer-name)))) (erase-buffer) - (insert-buffer buf) + (insert-buffer-substring buf) (mml-preview-insert-mail-followup-to) (let ((message-deletable-headers (if (message-news-p) nil diff --git a/lisp/mml1991.el b/lisp/mml1991.el index 66cd459..e675008 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -62,7 +62,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 +76,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 +100,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 +121,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 +159,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 +207,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 +233,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 +265,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 diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 2aa99b5..957e485 100644 --- 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)) @@ -820,7 +820,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 +848,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)))) -- 1.7.10.4