sync ports with The Matrix

inputmethods/anthy/Makefile

@@ -6,7 +6,7 @@ DISTNAME =	anthy-$V
 PKGNAME-main =	anthy-$V
 PKGNAME-emacs =	emacs-anthy-$V
 REVISION-main = 3
-REVISION-emacs = 8
+REVISION-emacs = 9
 
 SHARED_LIBS +=	anthydic             1.0      # .1.0
 SHARED_LIBS +=	anthy                1.0      # .1.0

inputmethods/anthy/patches/patch-src-util_anthy_el

@@ -39,6 +39,24 @@ Index: src-util/anthy.el
  	(if anthy-xemacs
  	    (if (coding-system-p (find-coding-system 'euc-japan))
  		(set-process-coding-system proc 'euc-japan 'euc-japan))
+@@ -864,7 +864,7 @@
+ ;; leim $B$N(B activate
+ ;;
+ (defun anthy-leim-activate (&optional name)
+-  (setq inactivate-current-input-method-function 'anthy-leim-inactivate)
++  (setq deactivate-current-input-method-function 'anthy-leim-inactivate)
+   (setq anthy-leim-active-p t)
+   (anthy-update-mode)
+   (when (eq (selected-window) (minibuffer-window))
+@@ -874,7 +874,7 @@
+ ;; emacs$B$N%P%0Hr$1$i$7$$$G$9(B
+ ;;
+ (defun anthy-leim-exit-from-minibuffer ()
+-  (inactivate-input-method)
++  (deactivate-input-method)
+   (when (<= (minibuffer-depth) 1)
+     (remove-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
+ 
 @@ -892,7 +892,7 @@
  	 ((event-matches-key-specifier-p event 'backspace) 8)
  	 (t