Give proper SAFE-CHARSET argument in each

call of make-coding-system.  Set exit-function for language
environment "Korean" to exit-korean-environment.
(setup-korean-environment): Moved to korean.el.

1 files changed, 10 insertions, 18 deletions

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index c410b8bd438..2c6a435efb0 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -32,7 +32,8 @@
  'korean-iso-8bit 2 ?K
  "ISO 2022 based EUC encoding for Korean KSC5601 (MIME:EUC-KR)"
  '((ascii t) korean-ksc5601 nil nil
-   nil ascii-eol ascii-cntl))
+   nil ascii-eol ascii-cntl)
+ '(ascii korean-ksc5601))
 
 (define-coding-system-alias 'euc-kr 'korean-iso-8bit)
 (define-coding-system-alias 'euc-korea 'korean-iso-8bit)
@@ -42,31 +43,22 @@
  "ISO 2022 based 7-bit encoding for Korean KSC5601 (MIME:ISO-2022-KR)."
  '(ascii (nil korean-ksc5601) nil nil
          nil ascii-eol ascii-cntl seven locking-shift nil nil nil nil nil
-         designation-bol))
+         designation-bol)
+ '(ascii korean-ksc5601))
 
 (define-coding-system-alias 'iso-2022-kr 'korean-iso-7bit-lock)
 
-(defun setup-korean-environment ()
-  "Setup multilingual environment (MULE) for Korean."
-  (interactive)
-  (setup-english-environment)
-  (setq coding-category-iso-8-2 'korean-iso-8bit)
-
-  (set-coding-priority
-   '(coding-category-iso-7
-     coding-category-iso-8-2
-     coding-category-iso-8-1))
-
-  (set-default-coding-systems 'korean-iso-8bit)
-
-  (setq default-input-method "korean-hangul"))
-
 (set-language-info-alist
  "Korean" '((setup-function . setup-korean-environment)
+            (exit-function . exit-korean-environment)
             (tutorial . "TUTORIAL.kr")
             (charset . (korean-ksc5601))
             (coding-system . (korean-iso-7bit-lock korean-iso-8bit))
             (sample-text . "Hangul ($(CGQ1[(B)        $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
-            (documentation . t)))
+            (documentation . "The following key bindings are avairable:
+  Shift-SPC:    toggle-korean-input-mthod
+  Control-F10:  quail-hangul-switch-symbol-ksc
+  F9:           quail-hangul-switch-hanja")
+            ))
 
 ;;; korean.el ends here