Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1500

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 788957acd208ae7bba1036f28ed5ee2e1f76aa4e..14ac0aa89dcbc7fff47f57c00e907aaa8b00cfef 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,19 @@
 
        * mm-util.el (mm-charset-override-alist): Declare for compiler.
 
+2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs
+       knows since the charset specified might be a bogus alias that
+       mm-charset-synonym-alist provides.
+
+2008-12-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mm-util.el (mm-charset-synonym-alist): Add bogus names "UTF8" and
+       "ISO_8859-1".
+
+       * gnus-start.el (gnus-backup-startup-file): Improve doc string.
+
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-charset-eval-alist):

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index f28bc17ecccb0951bcfec0a0104cfe4cd893c6a5..773f8203e4ba31a35c3694602a1b82580b85c448 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -50,7 +50,7 @@
   :type 'file)
 
 (defcustom gnus-backup-startup-file 'never
-  "Whether to create backup files.
+  "Control use of version numbers for backups of `gnus-startup-file'.
 This variable takes the same values as the `version-control'
 variable."
   :version "22.1"

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 1d23050b36441cf21543712b89d440fd9b6811d0..1c28f375db042588b3f5efb8c3c430eac578767a 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -269,10 +269,18 @@ the alias.  Else windows-NUMBER is used."
     ,@(when (and (not (mm-coding-system-p 'gbk))
                 (mm-coding-system-p 'cp936))
        '((gbk . cp936)))
+    ;; UTF8 is a bogus name for UTF-8
+    ,@(when (and (not (mm-coding-system-p 'utf8))
+                (mm-coding-system-p 'utf-8))
+       '((utf8 . utf-8)))
     ;; ISO8859-1 is a bogus name for ISO-8859-1
     ,@(when (and (not (mm-coding-system-p 'iso8859-1))
                 (mm-coding-system-p 'iso-8859-1))
        '((iso8859-1 . iso-8859-1)))
+    ;; ISO_8859-1 is a bogus name for ISO-8859-1
+    ,@(when (and (not (mm-coding-system-p 'iso_8859-1))
+                (mm-coding-system-p 'iso-8859-1))
+       '((iso_8859-1 . iso-8859-1)))
     )
   "A mapping from unknown or invalid charset names to the real charset names.
 

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index f8968fbcb7c6141421ad11f1287cc9073455eceb..3e3cb2ccda4355654bf593739473799fe4e793f3 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -482,7 +482,12 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                 (setq charset nil
                       coding nil))
                (charset
-                (setq charset (intern (downcase charset)))))
+                ;; The value of `charset' might be a bogus alias that
+                ;; `mm-charset-synonym-alist' provides, like `utf8',
+                ;; so we prefer the MIME charset that Emacs knows for
+                ;; the coding system `coding'.
+                (setq charset (or (mm-coding-system-to-mime-charset coding)
+                                  (intern (downcase charset))))))
          (if (and (not raw)
                   (member (car (split-string type "/")) '("text" "message")))
              (progn