2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d55ecc7fd52..81afe67fd5b 100644
--- 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 5a3f7246f9c..0fbd6453c55 100644
--- 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.