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 6db81be05f3..140f7201d80 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el | |||
| @@ -283,17 +283,20 @@ Whether the passphrase is cached at all is controlled by | |||
| 283 | (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear)) | 283 | (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear)) |
| 284 | (signature (car pair))) | 284 | (signature (car pair))) |
| 285 | (delete-region (point-min) (point-max)) | 285 | (delete-region (point-min) (point-max)) |
| 286 | (mm-with-unibyte-current-buffer | 286 | (insert |
| 287 | (insert signature) | 287 | (with-temp-buffer |
| 288 | (goto-char (point-min)) | 288 | (set-buffer-multibyte nil) |
| 289 | (while (re-search-forward "\r+$" nil t) | 289 | (insert signature) |
| 290 | (replace-match "" t t)) | 290 | (goto-char (point-min)) |
| 291 | (when cte | 291 | (while (re-search-forward "\r+$" nil t) |
| 292 | (mm-encode-content-transfer-encoding cte)) | 292 | (replace-match "" t t)) |
| 293 | (goto-char (point-min)) | 293 | (when cte |
| 294 | (when headers | 294 | (mm-encode-content-transfer-encoding cte)) |
| 295 | (insert headers)) | 295 | (goto-char (point-min)) |
| 296 | (insert "\n")) | 296 | (when headers |
| 297 | (insert headers)) | ||
| 298 | (insert "\n") | ||
| 299 | (buffer-string))) | ||
| 297 | t))) | 300 | t))) |
| 298 | 301 | ||
| 299 | (defun mml1991-epg-encrypt (cont &optional sign) | 302 | (defun mml1991-epg-encrypt (cont &optional sign) |