Merge changes from emacs-24 branch

[bpt/emacs.git] / lisp / language / korean.el

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index e8e78bf..9f93f76 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 -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   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, 2009
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -70,11 +69,11 @@
            (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 for controlling Korean input methods:
@@ -87,5 +86,4 @@ and the following key bindings are available within Korean input methods:
 
 (provide 'korean)
 
-;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
 ;;; korean.el ends here