From d62d49df37d3609a53a39d647db4c5e974755b5a Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Thu, 3 Jan 2002 06:52:30 +0000 Subject: [PATCH] 2002-01-03 ShengHuo ZHU * mm-util.el (mm-charset-to-coding-system): Don't setq charset. --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/mm-util.el | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 885687c043e..440c98695b2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2002-01-03 ShengHuo ZHU + + * mm-util.el (mm-charset-to-coding-system): Don't setq charset. + 2002-01-01 ShengHuo ZHU * 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 e752bf7ee06..6e56f9b12ef 100644 --- 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 ;; MORIOKA Tomohiko @@ -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). -- 2.39.2