diff options
| author | Paul Eggert | 2012-07-29 09:29:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-29 09:29:23 -0700 |
| commit | bb6eb9fcbd3ce25724ce3823132fa5d758a5ade1 (patch) | |
| tree | 0ee2da6034c58ad59631a428fb2c8fa447486d4e | |
| parent | 417a7a0e4da19593aaea8dbe665c031c6789f205 (diff) | |
| download | emacs-bb6eb9fcbd3ce25724ce3823132fa5d758a5ade1.tar.gz emacs-bb6eb9fcbd3ce25724ce3823132fa5d758a5ade1.zip | |
* international/mule-cmds.el (inactivate-input-method): Mark obsolete.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 |
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 @@ | |||
| 13 | Rename from inactivate-current-input-method-function. | 13 | Rename from inactivate-current-input-method-function. |
| 14 | (input-method-deactivate-hook): New hook. | 14 | (input-method-deactivate-hook): New hook. |
| 15 | (input-method-inactivate-hook): Mark obsolete. | 15 | (input-method-inactivate-hook): Mark obsolete. |
| 16 | (inactivate-input-method): Mark obsolete. | ||
| 17 | |||
| 16 | * international/quail.el (quail-activate): | 18 | * international/quail.el (quail-activate): |
| 17 | Also run quail-deactivate-hook. | 19 | Also run quail-deactivate-hook. |
| 18 | (quail-deactivate): Rename from quail-inactivate. | 20 | (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." | |||
| 1468 | (setq current-input-method nil) | 1468 | (setq current-input-method nil) |
| 1469 | (force-mode-line-update))))) | 1469 | (force-mode-line-update))))) |
| 1470 | 1470 | ||
| 1471 | (define-obsolete-function-alias | ||
| 1472 | 'inactivate-input-method | ||
| 1473 | 'deactivate-input-method "24.2") | ||
| 1474 | |||
| 1471 | (defun set-input-method (input-method &optional interactive) | 1475 | (defun set-input-method (input-method &optional interactive) |
| 1472 | "Select and activate input method INPUT-METHOD for the current buffer. | 1476 | "Select and activate input method INPUT-METHOD for the current buffer. |
| 1473 | This also sets the default input method to the one you specify. | 1477 | This also sets the default input method to the one you specify. |