--- a/lisp/mule/korean.el	Mon Aug 13 11:24:10 2007 +0200
+++ b/lisp/mule/korean.el	Mon Aug 13 11:25:01 2007 +0200
@@ -1,4 +1,4 @@
-;;; korean.el --- Support for Korean
+;;; korean.el --- Support for Korean -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
@@ -66,10 +66,12 @@
     (setq-default its:*current-map* (its:get-mode-map "hangul"))))
 
 ;; (make-coding-system
-;;  'euc-kr 2 ?K
-;;  "Coding-system of Korean EUC (Extended Unix Code)."
-;;  '((ascii t) korean-ksc5601 nil nil
-;;    nil ascii-eol ascii-cntl))
+;;  'korean-iso-8bit 2 ?K
+;;  "ISO 2022 based EUC encoding for Korean KSC5601 (MIME:EUC-KR)"
+;;  '(ascii korean-ksc5601 nil nil
+;;    nil ascii-eol ascii-cntl)
+;;  '((safe-charsets ascii korean-ksc5601)
+;;    (mime-charset . euc-kr)))
 
 (make-coding-system
  'euc-kr 'iso2022
@@ -81,14 +83,16 @@
 
 ;;(define-coding-system-alias 'euc-kr 'euc-korea)
 
-(copy-coding-system 'euc-kr 'korean-euc)
+(define-coding-system-alias 'korean-euc 'euc-kr)
 
 ;; (make-coding-system
 ;;  'iso-2022-kr 2 ?k
-;;  "MIME ISO-2022-KR"
+;;  "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)
+;;  '((safe-charsets ascii korean-ksc5601)
+;;    (mime-charset . iso-2022-kr)))
 
 (make-coding-system
  'iso-2022-kr 'iso2022
@@ -101,49 +105,23 @@
    mnemonic "Ko/7bit"
    eol-type lf))
 
-(defun setup-korean-environment ()
-  "Setup multilingual environment (MULE) for Korean."
-  (interactive)
-  (setup-english-environment)
-  ;; (setq coding-category-iso-8-2 'euc-kr)
-  (set-coding-category-system 'iso-8-2 'euc-kr)
-
-  ;; (set-coding-priority
-  ;;  '(coding-category-iso-7
-  ;;    coding-category-iso-8-2
-  ;;    coding-category-iso-8-1))
-  (set-coding-priority-list
-   '(iso-8-2
-     iso-7
-     iso-8-1
-     iso-8-designate
-     iso-lock-shift
-     no-conversion
-     shift-jis
-     big5))
-
-  (set-default-coding-systems 'euc-kr)
-
-  ;; (when (eq 'x (device-type (selected-device)))
-  ;;   (x-use-halfwidth-roman-font 'korean-ksc5601 "ksc5636"))
-
-  ;; EGG specific setup 97.02.05 jhod
-  (when (featurep 'egg)
-    (when (not (featurep 'egg-kor))
-      (provide 'egg-kor)
-      (load "its-hangul")
-      (setq its:*standard-modes*
-	    (cons (its:get-mode-map "hangul") its:*standard-modes*)))
-    (setq-default its:*current-map* (its:get-mode-map "hangul")))
-
-  (setq default-input-method "korean-hangul"))
+;; (define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr)
 
 (set-language-info-alist
- "Korean" '((setup-function . setup-korean-environment)
+ "Korean" '((setup-function . setup-korean-environment-internal)
+	    (exit-function . exit-korean-environment)
 	    (tutorial . "TUTORIAL.ko")
-	    (charset . (korean-ksc5601))
-	    (coding-system . (iso-2022-kr euc-kr))
+	    (charset korean-ksc5601)
+	    (coding-system euc-kr iso-2022-kr)
+	    (coding-priority euc-kr iso-2022-kr)
+	    (input-method . "korean-hangul")
+	    (features korea-util)
 	    (sample-text . "Hangul ($(CGQ1[(B)	$(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
-	    (documentation . t)))
+	    (documentation . "\
+The following key bindings are available while using Korean input methods:
+  Shift-SPC:	toggle-korean-input-mthod
+  Control-F9:	quail-hangul-switch-symbol-ksc
+  F9:		quail-hangul-switch-hanja")
+	    ))
 
 ;;; korean.el ends here