Mercurial > emacs
comparison lisp/gnus/mml2015.el @ 74347:b8fb10afdb2d
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 169-170)
- Merge from emacs--devo--0
- Update from CVS
2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string
with mm-encode-coding-string.
2006-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nneething.el (nneething-decode-file-name): Replace
decode-coding-string with mm-decode-coding-string.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-534
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 01 Dec 2006 11:53:31 +0000 |
parents | f5a6154fa9f2 |
children | e3694f1cb928 |
comparison
equal
deleted
inserted
replaced
74346:7318aed68fe7 | 74347:b8fb10afdb2d |
---|---|
783 (text (buffer-string)) | 783 (text (buffer-string)) |
784 (coding-system buffer-file-coding-system)) | 784 (coding-system buffer-file-coding-system)) |
785 (if (condition-case err | 785 (if (condition-case err |
786 (prog1 | 786 (prog1 |
787 (mm-with-unibyte-buffer | 787 (mm-with-unibyte-buffer |
788 (insert (encode-coding-string text coding-system)) | 788 (insert (mm-encode-coding-string text coding-system)) |
789 (pgg-verify-region (point-min) (point-max) nil t)) | 789 (pgg-verify-region (point-min) (point-max) nil t)) |
790 (goto-char (point-min)) | 790 (goto-char (point-min)) |
791 (while (search-forward "\r\n" nil t) | 791 (while (search-forward "\r\n" nil t) |
792 (replace-match "\n" t t)) | 792 (replace-match "\n" t t)) |
793 (mm-set-handle-multipart-parameter | 793 (mm-set-handle-multipart-parameter |