[MD:7092] migemo.el and r3998.

[Kyotaro HORIGUCHI <horiguti@xxxxxxxxxxx>]

ほりぐちです. Meadow3 r3998 でIME周りを々少変更しました.

 isearch で IME が普通に使えるようになります.

 これに伴って migemo に少々影響がでます. r3998 以降の Meadow で
migemo を使う人はすみませんが最後につけるパッチを migemo.el にあて
てください.

 影響といっても Meadow で MW32-IME を使っているときのための対処を
行っていたコードが不要になるためこの部分を削除するだけです. ついで
に ^C-e で isearch-mode と切り替えるときの不具合の修正も入っていま
す.

-- 
ほりぐちきょうたろう


--- migemo.el.old	2005-12-03 23:54:02.962361600 +0900
+++ migemo.el	2005-12-12 15:22:09.950125000 +0900
@@ -89,7 +89,4 @@
   "*Path of migemo frequent alist file. If nil, don't save and restore the file.")
 
-(defconst migemo-mw32-input-method (and (featurep 'meadow) "MW32-IME")
-  "Support \"MW32-IME\" for Meadow.")
-
 ;; internal variables
 (defvar migemo-process nil)
@@ -522,8 +519,4 @@
 	     (boundp 'current-input-method))
     (setq migemo-current-input-method current-input-method)
-    (when (and migemo-mw32-input-method
-	       (stringp migemo-current-input-method)
-	       (string= migemo-current-input-method migemo-mw32-input-method))
-      (set-input-method nil))
     (setq current-input-method nil)))
 
@@ -534,8 +527,4 @@
   (when (and migemo-isearch-enable-p
 	     (boundp 'current-input-method))
-    (when (and migemo-mw32-input-method
-	       (stringp migemo-current-input-method)
-	       (string= migemo-current-input-method migemo-mw32-input-method))
-      (set-input-method migemo-current-input-method))
     (setq current-input-method migemo-current-input-method)))
 
@@ -617,5 +606,10 @@
     (unless (or isearch-regexp isearch-word)
       (discard-input)
-      (setq migemo-isearch-enable-p (not migemo-isearch-enable-p)))
+      (if (setq migemo-isearch-enable-p (not migemo-isearch-enable-p))
+	  (when (boundp 'current-input-method)
+	    (setq migemo-current-input-method current-input-method)
+	    (setq current-input-method nil))
+	(when (boundp 'current-input-method)
+	  (setq current-input-method migemo-current-input-method))))
     (isearch-message))