Synch to No Gnus 200406281152.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b52fe4..89d598c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2004-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * mm-util.el (mm-mime-mule-charset-alist): Use shift_jis instead
-       of iso-2022-jp-2 for the katakana-jisx0201 mule charset; add new
+       * mm-util.el (mm-coding-system-p): Return a coding-system.
+       (mm-mime-mule-charset-alist): Use shift_jis instead of
+       iso-2022-jp-2 for the katakana-jisx0201 mule charset; add new
        entries for the mime charsets iso-2022-jp-3 and shift_jis.
        (mm-coding-system-priorities): Use shift_jis and iso-8859-1
        instead of japanese-shift-jis and iso-latin-1 respectively in

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index cbaff05..36b4602 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -128,13 +128,16 @@
 
 (defun mm-coding-system-p (cs)
   "Return non-nil if CS is a symbol naming a coding system.
-In XEmacs, also return non-nil if CS is a coding system object."
+In XEmacs, also return non-nil if CS is a coding system object.
+If CS is available, return CS itself in Emacs, and return a coding
+system object in XEmacs."
   (if (fboundp 'find-coding-system)
       (find-coding-system cs)
     (if (fboundp 'coding-system-p)
-       (coding-system-p cs)
+       (when (coding-system-p cs)
+         cs)
       ;; Is this branch ever actually useful?
-      (memq cs (mm-get-coding-system-list)))))
+      (car (memq cs (mm-get-coding-system-list))))))
 
 (defvar mm-charset-synonym-alist
   `(
@@ -541,14 +544,11 @@ This affects whether coding conversion should be attempted generally."
        (not inconvertible))))
 
 (defun mm-sort-coding-systems-predicate (a b)
-  (let ((priorities
-        (mapcar (lambda (cs)
-                  ;; Note: invalid entries are dropped silently
-                  (and (mm-coding-system-p cs)
-                       (coding-system-base cs)))
-                mm-coding-system-priorities)))
-    (and (mm-coding-system-p a)
-        (if (mm-coding-system-p b)
+  (let ((priorities (mapcar 'mm-coding-system-p
+                           ;; Note: invalid entries are dropped silently
+                           mm-coding-system-priorities)))
+    (and (setq a (mm-coding-system-p a))
+        (if (setq b (mm-coding-system-p b))
             (> (length (memq (coding-system-base a) priorities))
                (length (memq (coding-system-base b) priorities)))
           t))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 68f15cd..7f0ae5f 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * emacs-mime.texi (Encoding Customization): Fix
+       mm-coding-system-priorities entry.
+
 2004-06-28  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.texi (Setting Process Marks): Fix `M P a' entry.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 3de34ae..9f2820c 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -837,12 +837,12 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
 @vindex mm-coding-system-priorities
 Prioritize coding systems to use for outgoing messages.  The default
 is @code{nil}, which means to use the defaults in Emacs.  It is a list of
-coding system symbols (aliases of coding systems does not work, use
-@kbd{M-x describe-coding-system} to make sure you are not specifying
-an alias in this variable).  For example, if you have configured Emacs
+coding system symbols (aliases of coding systems are also allowed, use
+@kbd{M-x describe-coding-system} to make sure you are specifying correct
+coding system names).  For example, if you have configured Emacs
 to prefer UTF-8, but wish that outgoing messages should be sent in
 ISO-8859-1 if possible, you can set this variable to
-@code{(iso-latin-1)}.  You can override this setting on a per-message
+@code{(iso-8859-1)}.  You can override this setting on a per-message
 basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}).
 
 @item mm-content-transfer-encoding-defaults