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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 33fd124b1367c1f0d0a7f92ba5d2bdab03766bc2..f33f5a38acfbf306eee00310819264677740cee2 100644 (file)
--- 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 435c3bba00fd251e0b5fc2c73d16092d532cdeac..08f23aaf28223869a3ea1fe44a37b677461654e7 100644 (file)
--- 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'