* international/mule-cmds.el (inactivate-input-method): Mark obsolete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d55ecc7fd52a29c9a0c276c4a76714eb0a8c49cf..81afe67fd5bc8379ba1fd4a2c74455c56a3b9702 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,8 @@
        Rename from inactivate-current-input-method-function.
        (input-method-deactivate-hook): New hook.
        (input-method-inactivate-hook): Mark obsolete.
+       (inactivate-input-method): Mark obsolete.
+
        * international/quail.el (quail-activate):
        Also run quail-deactivate-hook.
        (quail-deactivate): Rename from quail-inactivate.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5a3f7246f9c72e5c7d82322c8f740b2d6c67d9be..0fbd6453c554b1a9e36654dc8072b3434648e725 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1468,6 +1468,10 @@ If INPUT-METHOD is nil, deactivate any current input method."
        (setq current-input-method nil)
        (force-mode-line-update)))))
 
+(define-obsolete-function-alias
+  'inactivate-input-method
+  'deactivate-input-method "24.2")
+
 (defun set-input-method (input-method &optional interactive)
   "Select and activate input method INPUT-METHOD for the current buffer.
 This also sets the default input method to the one you specify.