diff options
author | Miles Bader <miles@gnu.org> | 2006-12-01 11:53:31 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-12-01 11:53:31 +0000 |
commit | d411ec9bdf533edc011152c96ae3878754c7ba7b (patch) | |
tree | b12736679626074d6e1a00750eed5e986c63b6d6 /lisp/gnus/mml2015.el | |
parent | 83300ba1d0032ec843c2ec0950c983a6ce79e633 (diff) | |
download | emacs-d411ec9bdf533edc011152c96ae3878754c7ba7b.tar.gz |
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
Diffstat (limited to 'lisp/gnus/mml2015.el')
-rw-r--r-- | lisp/gnus/mml2015.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 591ef647678..6c58272509e 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -785,7 +785,7 @@ (if (condition-case err (prog1 (mm-with-unibyte-buffer - (insert (encode-coding-string text coding-system)) + (insert (mm-encode-coding-string text coding-system)) (pgg-verify-region (point-min) (point-max) nil t)) (goto-char (point-min)) (while (search-forward "\r\n" nil t) |