(remove_char_attribute): New function.

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

diff --git a/lisp/mule/mule-cmds.el b/lisp/mule/mule-cmds.el
index 20cd3b5..07261fd 100644 (file)
--- a/lisp/mule/mule-cmds.el
+++ b/lisp/mule/mule-cmds.el
@@ -168,11 +168,15 @@ This sets the following coding systems:
   ;;(setq default-keyboard-coding-system coding-system)
   (setq keyboard-coding-system coding-system)
   ;;(setq default-process-coding-system (cons coding-system coding-system))
+  ;; Refer to coding-system-for-read and coding-system-for-write
+  ;; so that C-x RET c works.
   (add-hook 'comint-exec-hook
            `(lambda ()
               (let ((proc (get-buffer-process (current-buffer))))
-                (set-process-input-coding-system  proc ',coding-system)
-                (set-process-output-coding-system proc ',coding-system)))
+                (set-process-input-coding-system
+                 proc (or coding-system-for-read ',coding-system))
+                (set-process-output-coding-system
+                 proc (or coding-system-for-write ',coding-system))))
            'append)
   (setq file-name-coding-system coding-system))
 
@@ -787,6 +791,8 @@ The return value is a string."
         (input-method (completing-read prompt input-method-alist
                                        nil t nil 'input-method-history
                                        default)))
+    (if (and input-method (symbolp input-method))
+       (setq input-method (symbol-name input-method)))
     (if (> (length input-method) 0)
        input-method
       (if inhibit-null
@@ -1084,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