(sort-coding-systems): Adjust

priority of utf-16 and x-ctext.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d17bda438502bc5e0ca08705ab136b2953224541..b3ed666b25d0e580923117367e2b88a445ce1e65 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2003-01-03  Dave Love  <fx@gnu.org>
+
+       * international/mule-cmds.el (sort-coding-systems): Adjust
+       priority of utf-16 and x-ctext.
+
+       * international/utf-8.el (utf-translate-cjk): Call
+       optimize-char-coding-system-table.
+
+       * international/ucs-tables.el (ucs-unify-8859, ucs-fragment-8859):
+       Call optimize-char-coding-system-table.
+
+       * international/mule.el (register-char-codings): Don't call
+       optimize-char-coding-system-table here.
+       (keyboard-coding-system): Doc fix.  Update :version.
+
+       * textmodes/nroff-mode.el (nroff-mode-hook): Customize.
+       (nroff-imenu-expression): New.
+       (nroff-mode): Use it.
+
+       * autoinsert.el (auto-insert-alist): Add man page skeleton.
+
 2003-01-03  Andre Spiegel  <spiegel@gnu.org>
 
        * vc-rcs.el (vc-rcs-revert): Unlock only if the user does have

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index d5b7663c5f985d37724e77b82274519587f29b41..c70fa7a43a5130aca3d0d29a4f455d7209a5a287 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -425,9 +425,18 @@ non-nil, it is used to sort CODINGS in the different way than above."
                    (let ((base (coding-system-base x)))
                      (+ (if (eq base most-preferred) 64 0)
                         (let ((mime (coding-system-get base 'mime-charset)))
+                          ;; Prefer coding systems corresponding to a
+                          ;; MIME charset.
                           (if mime
-                              (if (string-match "^x-" (symbol-name mime))
-                                  16 32)
+                              ;; Lower utf-16 priority so that we
+                              ;; normally prefer utf-8 to it, and put
+                              ;; x-ctext below that.
+                              (cond ((or (eq base 'mule-utf-16-le)
+                                         (eq base 'mule-utf-16-be))
+                                     16)
+                                    ((string-match "^x-" (symbol-name mime))
+                                     8)
+                                    (t 32))
                             0))
                         (if (memq base lang-preferred) 8 0)
                         (if (string-match "-with-esc$" (symbol-name base))