Changeset 3907

Timestamp:

10/13/05 21:49:54 (3 years ago)

Author:

horiguti

Message:

Make it unnecessary to call mw32-ime-initialize.

Files:

• trunk/lisp/ChangeLog.Meadow (modified) (1 diff)
• trunk/lisp/international/meadow.el (modified) (5 diffs)

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-10-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/meadow.el (mw32-ime-toggle): Obsoleted, but left
+        for compatibility.
+        (mw32-ime-initialize): Ditto.
+        (mw32-ime-state-switch): Initialize hooks for control ime if not
+        done.
+
-2005-10-06  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/lisp/international/meadow.el

@@ -413 +413 @@
-    (force-mode-line-update t)))
-
+;;; mw32-ime-toggle and mw32-ime-initialize are obsolete.
+;;; These functions left here for backward compatibility.
-(defun mw32-ime-toggle ()
+  "This is obsoleted function."
-  (interactive)
-  (if (equal current-input-method "MW32-IME")
@@ -420 +423 @@
-
-(defun mw32-ime-initialize ()
+  "This is obsoleted function. It is unnecessary to call this
+function to initialize MW32-IME."
-  (cond
-   ((and (eq system-type 'windows-nt)
@@ -434 +439 @@
-      (add-hook 'set-selected-window-buffer-functions
-                'mw32-ime-set-selected-window-buffer-hook)
-      (define-key global-map [kanji] 'mw32-ime-toggle)
-      (if coding-system
-          (set-keyboard-coding-system (cdr coding-system)))))))
@@ -448 +452 @@
-                      'mw32-ime-select-window-hook)
-         (remove-hook 'set-selected-window-buffer-functions
-
-
+
-
-(defun mw32-ime-exit-from-minibuffer ()
@@ -459 +462 @@
-  (if arg
-      (progn
+        (when (null (memq 'mw32-ime-select-window-hook
+                          select-window-functions))
+          (add-hook 'select-window-functions 'mw32-ime-select-window-hook)
+          (add-hook 'set-selected-window-buffer-functions
+                    'mw32-ime-set-selected-window-buffer-hook)
+          (mw32-ime-init-mode-line-display))
+
-        (setq inactivate-current-input-method-function
-              'mw32-ime-state-switch)