diff options
| -rw-r--r-- | lisp/gnus/mml1991.el | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index bb5c940f173..6db81be05f3 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el | |||
| @@ -200,17 +200,20 @@ Whether the passphrase is cached at all is controlled by | |||
| 200 | (pop-to-buffer pgg-errors-buffer) | 200 | (pop-to-buffer pgg-errors-buffer) |
| 201 | (error "Encrypt error")) | 201 | (error "Encrypt error")) |
| 202 | (delete-region (point-min) (point-max)) | 202 | (delete-region (point-min) (point-max)) |
| 203 | (mm-with-unibyte-current-buffer | 203 | (insert |
| 204 | (insert-buffer-substring pgg-output-buffer) | 204 | (with-temp-buffer |
| 205 | (goto-char (point-min)) | 205 | (set-buffer-multibyte nil) |
| 206 | (while (re-search-forward "\r+$" nil t) | 206 | (insert-buffer-substring pgg-output-buffer) |
| 207 | (replace-match "" t t)) | 207 | (goto-char (point-min)) |
| 208 | (when cte | 208 | (while (re-search-forward "\r+$" nil t) |
| 209 | (mm-encode-content-transfer-encoding cte)) | 209 | (replace-match "" t t)) |
| 210 | (goto-char (point-min)) | 210 | (when cte |
| 211 | (when headers | 211 | (mm-encode-content-transfer-encoding cte)) |
| 212 | (insert headers)) | 212 | (goto-char (point-min)) |
| 213 | (insert "\n")) | 213 | (when headers |
| 214 | (insert headers)) | ||
| 215 | (insert "\n") | ||
| 216 | (buffer-string))) | ||
| 214 | t)) | 217 | t)) |
| 215 | 218 | ||
| 216 | (defun mml1991-pgg-encrypt (cont &optional sign) | 219 | (defun mml1991-pgg-encrypt (cont &optional sign) |