Merge from emacs-24

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

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 9d60089450d1e07d7a0b2d53a5836dd6af453e4a..711d24a5b00d2409cbf2f63219c220f2a2426c50 100644 (file)
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,9 +1,8 @@
-;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
+;;; korean.el --- support for Korean -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -43,7 +42,6 @@
 
 (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)
 
 (define-coding-system 'iso-2022-kr
   "ISO 2022 based 7-bit encoding for Korean KSC5601 (MIME:ISO-2022-KR)."
@@ -58,25 +56,34 @@
 
 (define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr)
 
+(define-coding-system 'korean-cp949
+  "CP949 (Microsoft Unified Hangul Code)"
+  :coding-type 'charset
+  :mnemonic ?K
+  :charset-list '(ascii cp949))
+
+(define-coding-system-alias 'cp949 'korean-cp949)
+
 (set-language-info-alist
  "Korean" '((setup-function . setup-korean-environment-internal)
            (exit-function . exit-korean-environment)
            (iso639-language . ko)
            (tutorial . "TUTORIAL.ko")
-           (charset korean-ksc5601)
-           (coding-system iso-2022-kr korean-iso-8bit)
+           (charset korean-ksc5601 cp949)
+           (coding-system iso-2022-kr korean-iso-8bit korean-cp949)
            (input-method . "korean-hangul")
            (features korea-util)
-           (coding-priority korean-iso-8bit iso-2022-kr)
+           (coding-priority korean-iso-8bit korean-cp949 iso-2022-kr)
            (sample-text . "Hangul (\e$(CGQ1[\e(B)        \e$(C>H3gGO<<?d\e(B, \e$(C>H3gGO=J4O1n\e(B")
            (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")
+The following key bindings are available for controlling Korean input methods:
+  Shift-SPC, Hangul:   toggle-korean-input-method
+  Control-F9:          quail-hangul-switch-symbol-ksc
+  F9:                  quail-hangul-switch-hanja
+and the following key bindings are available within Korean input methods:
+  F9, Hangul_Hanja:    hangul-to-hanja-conversion")
            ))
 
 (provide 'korean)
 
-;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
 ;;; korean.el ends here