deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)

* NEWS: Document these changes.
* leim/quail/uni-input.el (ucs-input-deactivate):
Rename from ucs-input-inactivate.
* leim/quail/hangul.el (hangul-input-method-deactivate):
Rename from hangul-input-method-inactivate.
* emulation/viper-init.el (viper-deactivate-input-method-action):
Rename from viper-inactivate-input-method-action.
(viper-deactivate-input-method):
Rename from viper-inactivate-input-method.
* lisp/follow.el (follow-inactive-menu): Rename from follow-deactive-menu.
* lisp/international/mule-cmds.el (deactivate-input-method):
Rename from inactivate-input-method.
Also run input-method-deactivate-hook.
(deactivate-current-input-method-function):
Rename from inactivate-current-input-method-function.
(input-method-deactivate-hook): New hook.
(input-method-inactivate-hook): Mark obsolete.
* lisp/international/quail.el (quail-activate):
Also run quail-deactivate-hook.
(quail-deactivate): Rename from quail-inactivate.
* lisp/international/robin.el (robin-activate):
Also run robin-deactivate-hook.
(robin-deactivate): Rename from robin-inactivate.

3 files changed, 22 insertions, 6 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index f3acaebec94..fbe656c037c 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)
+	* quail/uni-input.el (ucs-input-deactivate):
+	Rename from ucs-input-inactivate.
+	* quail/hangul.el (hangul-input-method-deactivate):
+	Rename from hangul-input-method-inactivate.
+
 2012-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* quail/ipa.el: Use cl-lib.
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index d30957ae7e6..c66c47b47fc 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -512,7 +512,7 @@ When a Korean input method is off, convert the following hangul character."
   "Activate Hangul input method INPUT-METHOD.
 FUNC is a function to handle input key.
 HELP-TEXT is a text set in `hangul-input-method-help-text'."
-  (setq inactivate-current-input-method-function 'hangul-input-method-inactivate
+  (setq deactivate-current-input-method-function 'hangul-input-method-deactivate
 	describe-current-input-method-function 'hangul-input-method-help
 	hangul-input-method-help-text help-text)
   (quail-delete-overlays)
@@ -520,8 +520,8 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'."
       (add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer))
   (set (make-local-variable 'input-method-function) func))
 
-(defun hangul-input-method-inactivate ()
-  "Inactivate the current Hangul input method."
+(defun hangul-input-method-deactivate ()
+  "Deactivate the current Hangul input method."
   (interactive)
   (unwind-protect
       (progn
@@ -530,6 +530,10 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'."
         (setq describe-current-input-method-function nil))
     (kill-local-variable 'input-method-function)))
 
+(define-obsolete-function-alias
+  'hangul-input-method-inactivate
+  'hangul-input-method-deactivate "24.2")
+
 (defun hangul-input-method-help ()
   "Describe the current Hangul input method."
   (interactive)
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 8d0e28d15a4..1cab31f83bb 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -99,7 +99,7 @@ While this input method is active, the variable
 	    (quail-delete-overlays)
 	    (setq describe-current-input-method-function nil))
 	(kill-local-variable 'input-method-function))
-    (setq inactivate-current-input-method-function 'ucs-input-inactivate)
+    (setq deactivate-current-input-method-function 'ucs-input-deactivate)
     (setq describe-current-input-method-function 'ucs-input-help)
     (quail-delete-overlays)
     (if (eq (selected-window) (minibuffer-window))
@@ -107,11 +107,15 @@ While this input method is active, the variable
     (set (make-local-variable 'input-method-function)
 	 'ucs-input-method)))
 
-(defun ucs-input-inactivate ()
-  "Inactivate UCS input method."
+(defun ucs-input-deactivate ()
+  "Deactivate UCS input method."
   (interactive)
   (ucs-input-activate -1))
 
+(define-obsolete-function-alias
+  'ucs-input-inactivate
+  'ucs-input-deactivate "24.2")
+
 (defun ucs-input-help ()
   (interactive)
   (with-output-to-temp-buffer "*Help*"