2002-01-03 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-util.el (mm-charset-to-coding-system): Don't setq charset.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 885687c043e8cfb2b432e61457c3ffbf627335e9..440c98695b2a1d6a121762fa203bcc23c2fcbcfc 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-charset-to-coding-system): Don't setq charset.
+
 2002-01-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el, gnus-art.el, gnus.el, gnus-cite.el: 

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index e752bf7ee06ec29e7692705718dd418284207b01..6e56f9b12ef60fa7d397838798c7c6fba74808ce 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1,5 +1,5 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -331,10 +331,8 @@ used as the line break code type of the coding system."
         )
     charset)
    ;; Translate invalid charsets.
-   ((mm-coding-system-p (setq charset
-                          (cdr (assq charset
-                                     mm-charset-synonym-alist))))
-    charset)
+   ((let ((cs (cdr (assq charset mm-charset-synonym-alist))))
+      (and cs (mm-coding-system-p charset) cs)))
    ;; Last resort: search the coding system list for entries which
    ;; have the right mime-charset in case the canonical name isn't
    ;; defined (though it should be).