Sync with r21_2_36.

[chise/xemacs-chise.git] / lisp / mule / mule-cmds.el

diff --git a/lisp/mule/mule-cmds.el b/lisp/mule/mule-cmds.el
index 1222b27..c0fa5a7 100644 (file)
--- a/lisp/mule/mule-cmds.el
+++ b/lisp/mule/mule-cmds.el
@@ -97,7 +97,7 @@ They means `lf', `crlf', and `cr' respectively."
       (let ((base (coding-system-base coding-system)))
         (if (not eol-type)
             base
-          (if (= eol-type orig-eol-type)
+          (if (eq eol-type orig-eol-type)
               coding-system
             (setq orig-eol-type (coding-system-eol-type base))
             (if (null orig-eol-type)
@@ -611,7 +611,8 @@ ALIST is an alist of KEY and INFO values.  See the documentation of
          (eval-after-load
              "menubar-items.elc"
            `(add-menu-button
-             '("Mule" "Describe Language Support")
+             '("%_Edit" "%_Multilingual (\"Mule\")"
+               "%_Describe Language Support")
              (vector ,lang-env
                      '(describe-language-environment ,lang-env)
                      t))))
@@ -622,11 +623,12 @@ ALIST is an alist of KEY and INFO values.  See the documentation of
       (eval-after-load
          "menubar-items.elc"
        `(add-menu-button
-         '("Mule" "Set Language Environment")
+         '("%_Edit" "%_Multilingual (\"Mule\")"
+           "%_Set Language Environment")
          (vector ,lang-env
                  '(set-language-environment ,lang-env)
                  t))))
-
+    
     (while alist
       (set-language-info lang-env (car (car alist)) (cdr (car alist)))
       (setq alist (cdr alist)))))
@@ -994,7 +996,7 @@ at point in the current buffer.
 But, if this flag is non-nil, it displays them in echo area instead.")
 
 (defvar input-method-exit-on-invalid-key nil
-  "This flag controls the behaviour of an input method on invalid key input.
+  "This flag controls the behavior of an input method on invalid key input.
 Usually, when a user types a key which doesn't start any character
 handled by the input method, the key is handled by turning off the
 input method temporarily.  After that key, the input method is re-enabled.
@@ -1088,19 +1090,34 @@ The default status is as follows:
   (set-coding-category-system 'shift-jis       'shift_jis)
   (set-coding-category-system 'big5            'big5)
   (cond ((eq (coding-system-type (coding-category-system 'utf-8)) 'utf-8)
-        (set-coding-category-system 'ucs-4 'iso-10646-ucs-4)
         (set-coding-category-system 'utf-8 'utf-8)
-        (set-coding-priority-list
-         '(iso-8-1
-           iso-8-2
-           iso-7
-           iso-lock-shift
-           iso-8-designate
-           utf-8
-           ucs-4
-           no-conversion
-           shift-jis
-           big5))
+        (cond ((eq (coding-system-type (coding-category-system 'ucs-4))
+                   'iso-10646-ucs-4)
+               (set-coding-category-system 'ucs-4 'iso-10646-ucs-4)
+               (set-coding-priority-list
+                '(iso-8-1
+                  iso-8-2
+                  iso-7
+                  iso-lock-shift
+                  iso-8-designate
+                  utf-8
+                  ucs-4
+                  no-conversion
+                  shift-jis
+                  big5))
+               )
+              (t
+               (set-coding-priority-list
+                '(iso-8-1
+                  iso-8-2
+                  iso-7
+                  iso-lock-shift
+                  iso-8-designate
+                  utf-8
+                  no-conversion
+                  shift-jis
+                  big5))
+               ))
         )
        (t
         (set-coding-priority-list