Mercurial > emacs
changeset 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 | 7318aed68fe7 |
| children | 4fd4b53813c6 |
| files | lisp/gnus/ChangeLog lisp/gnus/mml2015.el lisp/gnus/nneething.el |
| diffstat | 3 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Dec 01 00:47:25 2006 +0000 +++ b/lisp/gnus/ChangeLog Fri Dec 01 11:53:31 2006 +0000 @@ -1,3 +1,13 @@ +2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org> + + * mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string + with mm-encode-coding-string. + +2006-11-29 Katsumi Yamaoka <yamaoka@jpl.org> + + * nneething.el (nneething-decode-file-name): Replace + decode-coding-string with mm-decode-coding-string. + 2006-11-24 Juanma Barranquero <lekktu@gmail.com> * gnus-agent.el (gnus-agent-expire-unagentized-dirs)
--- a/lisp/gnus/mml2015.el Fri Dec 01 00:47:25 2006 +0000 +++ b/lisp/gnus/mml2015.el Fri Dec 01 11:53:31 2006 +0000 @@ -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)
--- a/lisp/gnus/nneething.el Fri Dec 01 00:47:25 2006 +0000 +++ b/lisp/gnus/nneething.el Fri Dec 01 11:53:31 2006 +0000 @@ -303,7 +303,7 @@ (setq buf (cons (string (string-to-number (match-string 1 file) 16)) (cons (substring file pos (match-beginning 0)) buf)) pos (match-end 0))) - (decode-coding-string + (mm-decode-coding-string (apply (function concat) (nreverse (cons (substring file pos) buf))) (or coding-system nnmail-pathname-coding-system))))