[Emacs-diffs] /srv/bzr/emacs/trunk r109266: * international/mule-cmds.el (inactivate-input-method): Mark obsolete.

[Paul Eggert]

------------------------------------------------------------
revno: 109266
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 09:29:23 -0700
message:
  * international/mule-cmds.el (inactivate-input-method): Mark obsolete.
modified:
  lisp/ChangeLog
  lisp/international/mule-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-29 08:18:29 +0000
+++ b/lisp/ChangeLog    2012-07-29 16:29:23 +0000
@@ -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.

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2012-07-29 07:16:45 +0000
+++ b/lisp/international/mule-cmds.el   2012-07-29 16:29:23 +0000
@@ -1468,6 +1468,10 @@
        (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.