X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/65e86587ab836aaa86b12ce30b219bcb4fcbaa06..5df4f04cd32af723742c81095b38ae83b3c2b462:/lisp/language/korean.el

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 3e04c13b7d..d7967a8e95 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,20 +1,23 @@
 ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
+;; Copyright (C) 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H13PRO009
 
 ;; Keywords: multilingual, Korean
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,9 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,47 +33,59 @@
 
 ;;; Code:
 
-(make-coding-system
- '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 'korean-iso-8bit
+  "ISO 2022 based EUC encoding for Korean KSC5601 (MIME:EUC-KR)."
+  :coding-type 'iso-2022
+  :mnemonic ?K
+  :designation [ascii korean-ksc5601 nil nil]
+  :charset-list '(ascii korean-ksc5601)
+  :mime-charset 'euc-kr)
 
 (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
- "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)
- '((safe-charsets ascii korean-ksc5601)
-   (mime-charset . iso-2022-kr)))
+(define-coding-system 'iso-2022-kr
+  "ISO 2022 based 7-bit encoding for Korean KSC5601 (MIME:ISO-2022-KR)."
+  :coding-type 'iso-2022
+  :mnemonic ?k
+  :designation [ascii (nil korean-ksc5601) nil nil]
+  :flags '(ascii-at-eol ascii-at-cntl 7-bit designation locking-shift
+			designation-bol)
+  :charset-list '(ascii korean-ksc5601)
+  :mime-charset 'iso-2022-kr
+  :suitable-for-keyboard t)
 
 (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 ($(CGQ1[(B)	$(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(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
+;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
 ;;; korean.el ends here