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/follow.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/follow.el')
| -rw-r--r-- | lisp/follow.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/follow.el b/lisp/follow.el index 0dea1917f85..a74862cb5d0 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -334,8 +334,8 @@ property `follow-mode-use-cache' to non-nil.") (defvar follow-active-menu nil "The menu visible when Follow mode is active.") -(defvar follow-deactive-menu nil - "The menu visible when Follow mode is deactivated.") +(defvar follow-inactive-menu nil + "The menu visible when Follow mode is inactive.") (defvar follow-inside-post-command-hook nil "Non-nil when inside Follow modes `post-command-hook'. |