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

3 files changed, 12 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 68c82da1c6b..787a5d58c6f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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)
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)
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el
index 92a62d12386..4b5f1871aa3 100644
--- a/lisp/gnus/nneething.el
+++ b/lisp/gnus/nneething.el
@@ -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))))