diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 00:16:45 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 00:16:45 -0700 |
| commit | 72b255c7e7856eb0abefb1149211a8be519f6fef (patch) | |
| tree | 29dcf155832dc040f3b0b21a64d88fe311c5c967 /leim/quail/uni-input.el | |
| parent | 2549c068e14ab1ddfb1f1ea38ca7736c16db7296 (diff) | |
| download | emacs-72b255c7e7856eb0abefb1149211a8be519f6fef.tar.gz | |
deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)
* NEWS: Document these changes.
* leim/quail/uni-input.el (ucs-input-deactivate):
Rename from ucs-input-inactivate.
* leim/quail/hangul.el (hangul-input-method-deactivate):
Rename from hangul-input-method-inactivate.
* emulation/viper-init.el (viper-deactivate-input-method-action):
Rename from viper-inactivate-input-method-action.
(viper-deactivate-input-method):
Rename from viper-inactivate-input-method.
* lisp/follow.el (follow-inactive-menu): Rename from follow-deactive-menu.
* lisp/international/mule-cmds.el (deactivate-input-method):
Rename from inactivate-input-method.
Also run input-method-deactivate-hook.
(deactivate-current-input-method-function):
Rename from inactivate-current-input-method-function.
(input-method-deactivate-hook): New hook.
(input-method-inactivate-hook): Mark obsolete.
* lisp/international/quail.el (quail-activate):
Also run quail-deactivate-hook.
(quail-deactivate): Rename from quail-inactivate.
* lisp/international/robin.el (robin-activate):
Also run robin-deactivate-hook.
(robin-deactivate): Rename from robin-inactivate.
Diffstat (limited to 'leim/quail/uni-input.el')
| -rw-r--r-- | leim/quail/uni-input.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el index 8d0e28d15a4..1cab31f83bb 100644 --- a/leim/quail/uni-input.el +++ b/leim/quail/uni-input.el @@ -99,7 +99,7 @@ While this input method is active, the variable (quail-delete-overlays) (setq describe-current-input-method-function nil)) (kill-local-variable 'input-method-function)) - (setq inactivate-current-input-method-function 'ucs-input-inactivate) + (setq deactivate-current-input-method-function 'ucs-input-deactivate) (setq describe-current-input-method-function 'ucs-input-help) (quail-delete-overlays) (if (eq (selected-window) (minibuffer-window)) @@ -107,11 +107,15 @@ While this input method is active, the variable (set (make-local-variable 'input-method-function) 'ucs-input-method))) -(defun ucs-input-inactivate () - "Inactivate UCS input method." +(defun ucs-input-deactivate () + "Deactivate UCS input method." (interactive) (ucs-input-activate -1)) +(define-obsolete-function-alias + 'ucs-input-inactivate + 'ucs-input-deactivate "24.2") + (defun ucs-input-help () (interactive) (with-output-to-temp-buffer "*Help*" |