Fix patterns to be registered in composition-function-table.

[gnu-emacs] / lisp / language / korean.el

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index ce3cb97d3f32d6442ad2a14980a94d0666efefbf..d03424ff093403de3fb48e48ca18ac9c6a564b14 100644 (file)
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,7 +1,7 @@
-;;; korean.el --- Support for Korean
+;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multilingual, Korean
 
@@ -29,53 +29,46 @@
 ;;; Code:
 
 (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)))
 
-(define-coding-system-alias 'euc-kr 'euc-korea)
+(define-coding-system-alias 'euc-kr 'korean-iso-8bit)
+(define-coding-system-alias 'euc-korea 'korean-iso-8bit)
+(define-coding-system-alias 'cp949 'korean-iso-8bit)
 
 (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))
-
-(register-input-method
- "Korean" '("quail-hangul" quail-use-package "quail/hangul"))
-(register-input-method
- "Korean" '("quail-hangul3" quail-use-package "quail/hangul3"))
-(register-input-method
- "Korean" '("quail-hanja" quail-use-package "quail/hanja"))
-(register-input-method
- "Korean" '("quail-symbol-ksc" quail-use-package "quail/symbol-ksc"))
-(register-input-method
- "Korean" '("quail-hanja-jis" quail-use-package "quail/hanja-jis"))
-
-(defun setup-korean-environment ()
-  "Setup multilingual environment (MULE) for Korean."
-  (interactive)
-  (setup-english-environment)
-  (setq coding-category-iso-8-2 'euc-kr)
-
-  (set-coding-priority
-   '(coding-category-iso-7
-     coding-category-iso-8-2
-     coding-category-iso-8-1))
-
-  (setq-default buffer-file-coding-system 'euc-kr)
-
-  (setq default-input-method '("Korean" . "quail-hangul"))
-  )
+        designation-bol)
+ '((safe-charsets ascii korean-ksc5601)
+   (mime-charset . iso-2022-kr)))
+
+(define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr)
 
 (set-language-info-alist
- "Korean" '((setup-function . setup-korean-environment)
-           (tutorial . "TUTORIAL.kr")
-           (charset . (korean-ksc5601))
-           (coding-system . (euc-kr iso-2022-kr))
+ "Korean" '((setup-function . setup-korean-environment-internal)
+           (exit-function . exit-korean-environment)
+           (tutorial . "TUTORIAL.ko")
+           (charset korean-ksc5601)
+           (coding-system iso-2022-kr korean-iso-8bit)
+           (input-method . "korean-hangul")
+           (features korea-util)
+           (coding-priority korean-iso-8bit iso-2022-kr)
            (sample-text . "Hangul (\e$(CGQ1[\e(B)        \e$(C>H3gGO<<?d\e(B, \e$(C>H3gGO=J4O1n\e(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")
+           ))
+
+(provide 'korean)
 
+;;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
 ;;; korean.el ends here