Add submodule support to f90.el.

[gnu-emacs] / lisp / language / korea-util.el

diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 56abda353367138d1c526b68e7bb9cb934c56a0d..e2367cf0f7ea9f4be04af68b16aec3e9a362a55e 100644 (file)
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -1,9 +1,8 @@
 ;;; korea-util.el --- utilities for Korean
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009
+;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -30,9 +29,9 @@
 
 ;;;###autoload
 (defvar default-korean-keyboard
-  (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") ""))
+   (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") ""))
       "3"
-    "")
+    ""))
   "*The kind of Korean keyboard for Korean input method.
 \"\" for 2, \"3\" for 3.")
 
@@ -99,7 +98,8 @@
   `((global [?\S- ] toggle-korean-input-method nil)
     (global [Hangul] toggle-korean-input-method nil)
     (global [C-f9] quail-hangul-switch-symbol-ksc nil)
-    (global [f9]  quail-hangul-switch-hanja nil)
+    (global [f9] hangul-to-hanja-conversion nil)
+    (global [Hangul_Hanja] hangul-to-hanja-conversion nil)
     (,isearch-mode-map [?\S- ] isearch-toggle-korean-input-method nil)
     (,isearch-mode-map [Hangul] isearch-toggle-korean-input-method nil)
     (,isearch-mode-map [C-f9] isearch-hangul-switch-symbol-ksc nil)
@@ -107,6 +107,7 @@
 
 ;;;###autoload
 (defun setup-korean-environment-internal ()
+  (use-cjk-char-width-table 'ko_KR)
   (let ((key-bindings korean-key-bindings))
     (while key-bindings
       (let* ((this (car key-bindings))
@@ -120,12 +121,11 @@
          (setq old-def (lookup-key (car this) key))
          (define-key (car this) key new-def))
        (setcar (nthcdr 3 this) old-def))
-      (setq key-bindings (cdr key-bindings))))
-  (use-cjk-char-width-table 'ko_KR))
-
+      (setq key-bindings (cdr key-bindings)))))
 
 (defun exit-korean-environment ()
   "Exit Korean language environment."
+  (use-default-char-width-table)
   (let ((key-bindings korean-key-bindings))
     (while key-bindings
       (let* ((this (car key-bindings))
@@ -137,11 +137,9 @@
                (global-set-key key old-def))
          (if (eq (lookup-key (car this) key) new-def)
              (define-key (car this) key old-def))))
-      (setq key-bindings (cdr key-bindings))))
-  (use-default-char-width-table))
+      (setq key-bindings (cdr key-bindings)))))
 
 ;;
 (provide 'korea-util)
 
-;; arch-tag: b17d0981-05da-4577-99f8-1db87fff8b44
 ;;; korea-util.el ends here