mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from gnus--rel--5.10

Browse source 
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
This commit is contained in:
Miles Bader 2006-12-01 11:53:31 +00:00
parent 7ad0480294
commit 5538c331d1
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/gnus/ChangeLog
View file

@ -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)

2
lisp/gnus/mml2015.el
View file

@ -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)

2
lisp/gnus/nneething.el
View file

@ -303,7 +303,7 @@ included.")
(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))))