From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 30 Jun 2011 01:44:14 +0000 (+0000)
Subject: mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4 variations as ASCII... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~333
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=faf3b348f4bce8635eca47f2327f2283820c0865;p=emacs.git

mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4 variations as ASCII (bug#5458).
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 33fd124b136..f33f5a38acf 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4
+	variations as ASCII (bug#5458).
+
 2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnmh.el (nnmh-request-list-1): Work on MS Windows.
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 435c3bba00f..08f23aaf282 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -550,7 +550,8 @@ is not available."
 	 (let ((cs (cdr (assq charset mm-charset-override-alist))))
 	   (and cs (mm-coding-system-p cs) cs))))
    ;; ascii
-   ((eq charset 'us-ascii)
+   ((or (eq charset 'us-ascii)
+	(string-match "ansi.x3.4" (symbol-name charset)))
     'ascii)
    ;; Check to see whether we can handle this charset.  (This depends
    ;; on there being some coding system matching each `mime-charset'