Obsolete alias inactivate-current-input-method-function.

* lisp/international/mule-cmds.el: Create
inactivate-current-input-method-function as an obsolete alias for
deactivate-current-input-method-function.  See Katsumi Yamaoka in
<http://bugs.gnu.org/10150#46>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index abd61048c77c57ea1fe1ffaf354168aef5e59a41..075c6c7a3891e3e80ad32fba68ca68432a3e282e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Obsolete alias inactivate-current-input-method-function (Bug#10150).
+       * international/mule-cmds.el: Create
+       inactivate-current-input-method-function as an obsolete alias for
+       deactivate-current-input-method-function.  See Katsumi Yamaoka in
+       <http://bugs.gnu.org/10150#46>.
+
 2012-08-01  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-mode.el (calc-set-simplify-mode): Use `cond' instead

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a6ea2c1796c49dfb0d86b74fc01ebab4a054a072..30dc88a21f5c9f4317b2d29d76d65049d0e4aa62 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1331,6 +1331,9 @@ of `history-length', which see.")
 (make-variable-buffer-local 'input-method-history)
 (put 'input-method-history 'permanent-local t)
 
+(define-obsolete-variable-alias
+  'inactivate-current-input-method-function
+  'deactivate-current-input-method-function "24.2")
 (defvar deactivate-current-input-method-function nil
   "Function to call for deactivating the current input method.
 Every input method should set this to an appropriate value when activated.