(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.

[gnu-emacs] / lisp / language / china-util.el

diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index e70afa9b908248d386b0e1307d626383955cd347..a4a2569a3d064be246a82858e2647aa7e34636cd 100644 (file)
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -28,25 +28,19 @@
 (defun setup-chinese-gb-environment ()
   "Setup multilingual environment (MULE) for Chinese GB2312 users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-GB")
-  (setq default-input-method  "chinese-py-punct"))
+  (set-language-environment "Chinese-GB"))
 
 ;;;###autoload
 (defun setup-chinese-big5-environment ()
   "Setup multilingual environment (MULE) for Chinese Big5 users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-BIG5")
-  (setq default-input-method "chinese-py-punct-b5"))
+  (set-language-environment "Chinese-BIG5"))
 
 ;;;###autoload
 (defun setup-chinese-cns-environment ()
   "Setup multilingual environment (MULE) for Chinese CNS11643 family users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-CNS")
-  (setq default-input-method "chinese-quick-cns"))
+  (set-language-environment "Chinese-CNS"))
 
 ;; Hz/ZW encoding stuffs
 
@@ -159,8 +153,7 @@ Return the length of resulting text."
       ;; Chinese GB2312 -> "~{...~}"
       (goto-char (point-min))
       (if (re-search-forward "\\cc" nil t)
-         (let ((enable-multibyte-characters nil)
-               pos)
+         (let (pos)
            (goto-char (setq pos (match-beginning 0)))
            (encode-coding-region pos (point-max) 'iso-2022-7bit)
            (goto-char pos)