Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-45

Remove apparently vestigial uses of `mm-hack-charsets'

diff --git a/lisp/gnus/ChangeLog.22 b/lisp/gnus/ChangeLog.22
index 6ecee80d4d569c797cbe9ab791b2a7534e064d8b..4fcde1f3c09457b6a9a9d9a02a2c3d9a21e7cd3e 100644 (file)
--- a/lisp/gnus/ChangeLog.22
+++ b/lisp/gnus/ChangeLog.22
@@ -1,3 +1,9 @@
+2004-09-27  Miles Bader  <miles@gnu.org>
+
+       * mml.el (mml-parse-1): Remove apparently vestigial use of
+       `mm-hack-charsets'.
+       * mm-bodies.el (mm-encode-body): Likewise.
+
 2003-11-17  Kenichi Handa  <handa@m17n.org>
 
        * mm-util.el (mm-enable-multibyte): Call set-buffer-multibyte

diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 7e95ef3986bc2177985ddce2d2a5e539dad533af..40b920bb70d94d362e70250eece5684439145b62 100644 (file)
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -91,8 +91,7 @@ If no encoding was done, nil is returned."
            (mm-encode-coding-region (point-min) (point-max) charset)
            charset)
        (goto-char (point-min))
-       (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)
-                                                    mm-hack-charsets)))
+       (let ((charsets (mm-find-mime-charset-region (point-min) (point-max))))
          (cond
           ;; No encoding.
           ((null charsets)

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 21633fb4152adcc1be534f8e32dcb56ca625d0d7..c8f1c030accb48904fe5bfc44c8f7e5884a203ac 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,5 +1,5 @@
 ;;; mml.el --- A package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -213,8 +213,7 @@ one charsets.")
                         (list
                          (intern (downcase (cdr (assq 'charset tag))))))
                        (t
-                        (mm-find-mime-charset-region point (point)
-                                                     mm-hack-charsets))))
+                        (mm-find-mime-charset-region point (point)))))
        (when (and (not raw) (memq nil charsets))
          (if (or (memq 'unknown-encoding mml-confirmation-set)
                  (message-options-get 'unknown-encoding)