summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-07-29 00:16:45 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-07-29 00:16:45 -0700
commit72b255c7e7856eb0abefb1149211a8be519f6fef (patch)
tree29dcf155832dc040f3b0b21a64d88fe311c5c967 /lisp/mail
parent2549c068e14ab1ddfb1f1ea38ca7736c16db7296 (diff)
downloademacs-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/mail')
-rw-r--r--lisp/mail/sendmail.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 3b262e3fb53..b75841489c9 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -616,7 +616,7 @@ This also saves the value of `send-mail-function' via Customize."
;; (kill-local-variable 'enable-multibyte-characters)
(set-buffer-multibyte (default-value 'enable-multibyte-characters))
(if current-input-method
- (inactivate-input-method))
+ (deactivate-input-method))
;; Local variables for Mail mode.
(setq mail-send-actions actions)