Add new maintainer (deego).

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

diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 8afdbbfa822a0b4d41bf746f40315d4d1b3af91a..9a945668c7648d879476920ed190211ee0a006e7 100644 (file)
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -21,10 +21,15 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 ;;;###autoload
-(defvar default-korean-keyboard ""
+(defvar default-korean-keyboard
+  (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") ""))
+      "3"
+    "")
   "*The kind of Korean keyboard for Korean input method.
 \"\" for 2, \"3\" for 3.")
 
@@ -63,18 +68,27 @@
   (interactive)
   (let ((overriding-terminal-local-map nil))
     (toggle-korean-input-method))
+  (setq isearch-input-method-function input-method-function
+       isearch-input-method-local-p t)
+  (setq input-method-function nil)
   (isearch-update))
 
 (defun isearch-hangul-switch-symbol-ksc ()
   (interactive)
   (let ((overriding-terminal-local-map nil))
     (quail-hangul-switch-symbol-ksc))
+  (setq isearch-input-method-function input-method-function
+       isearch-input-method-local-p t)
+  (setq input-method-function nil)
   (isearch-update))
 
 (defun isearch-hangul-switch-hanja ()
   (interactive)
   (let ((overriding-terminal-local-map nil))
     (quail-hangul-switch-hanja))
+  (setq isearch-input-method-function input-method-function
+       isearch-input-method-local-p t)
+  (setq input-method-function nil)
   (isearch-update))
 
 ;; Information for setting and exiting Korean environment.
@@ -86,12 +100,6 @@
     (,isearch-mode-map [C-f9] isearch-hangul-switch-symbol-ksc nil)
     (,isearch-mode-map [f9] isearch-hangul-switch-hanja nil)))
 
-;;;###autoload
-(defun setup-korean-environment ()
-  "Setup multilingual environment (MULE) for Korean."
-  (interactive)
-  (set-language-environment "Korean"))
-
 ;;;###autoload
 (defun setup-korean-environment-internal ()
   (let ((key-bindings korean-key-bindings))
@@ -127,4 +135,4 @@
 ;;
 (provide 'korea-util)
 
-;;; korean-util.el ends here
+;;; korea-util.el ends here