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 /lisp/emulation/viper.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 'lisp/emulation/viper.el')
| -rw-r--r-- | lisp/emulation/viper.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 4219688a4ba..81fbfb0394c 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -971,9 +971,9 @@ It also can't undo some Viper settings." (if (featurep 'emacs) (eval-after-load "mule-cmds" '(progn - (defadvice inactivate-input-method (after viper-mule-advice activate) + (defadvice deactivate-input-method (after viper-mule-advice activate) "Set viper-special-input-method to disable intl. input methods." - (viper-inactivate-input-method-action)) + (viper-deactivate-input-method-action)) (defadvice activate-input-method (after viper-mule-advice activate) "Set viper-special-input-method to enable intl. input methods." (viper-activate-input-method-action)) @@ -985,14 +985,14 @@ It also can't undo some Viper settings." '(progn (add-hook 'input-method-activate-hook 'viper-activate-input-method-action t) - (add-hook 'input-method-inactivate-hook - 'viper-inactivate-input-method-action t))) + (add-hook 'input-method-deactivate-hook + 'viper-deactivate-input-method-action t))) ) (eval-after-load "mule-cmds" '(defadvice toggle-input-method (around viper-mule-advice activate) "Adjust input-method toggling in vi-state." (if (and viper-special-input-method (eq viper-current-state 'vi-state)) - (viper-inactivate-input-method) + (viper-deactivate-input-method) ad-do-it))) ) ; viper-set-hooks |