* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
@ 2011-11-27 23:38 Paul Eggert
2011-11-28 11:17 ` Štěpán Němec
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Paul Eggert @ 2011-11-27 23:38 UTC (permalink / raw)
To: 10150
Package: emacs
Severity: minor
Tags: patch
Standard English uses the adjective "inactive" and the verb
"deactivate"; "deactive" and "inactivate" are solecisms.
Emacs is pretty good about following standard usage but departs
from it in a few places in the API. Here's a patch. Since we're
in a feature freeze this should wait until after 24.1 is out.
-----
Fix misspellings of "deactivate" and "inactive".
* 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.
* lisp/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.
(deactivate-current-input-method-function):
Rename from inactivate-current-input-method-function.
(input-method-deactivate-hook):
Rename from input-method-inactivate-hook.
* lisp/international/quail.el (quail-deactivate):
Rename from quail-inactivate.
* lisp/international/robin.el (robin-deactivate):
Rename from robin-inactivate.
=== modified file 'leim/ChangeLog'
--- leim/ChangeLog 2011-11-20 19:35:27 +0000
+++ leim/ChangeLog 2011-11-27 23:29:49 +0000
@@ -1,3 +1,10 @@
+2011-11-27 Paul Eggert <eggert@cs.ucla.edu>
+
+ * quail/uni-input.el (ucs-input-deactivate):
+ Rename from ucs-input-inactivate.
+ * quail/hangul.el (hangul-input-method-deactivate):
+ Rename from hangul-input-method-inactivate.
+
2011-11-20 Juanma Barranquero <lekktu@gmail.com>
* quail/hangul.el (hangul-character): Fix typo.
=== modified file 'leim/quail/hangul.el'
--- leim/quail/hangul.el 2011-11-20 19:35:27 +0000
+++ leim/quail/hangul.el 2011-11-27 23:29:49 +0000
@@ -513,7 +513,7 @@
"Activate Hangul input method INPUT-METHOD.
FUNC is a function to handle input key.
HELP-TEXT is a text set in `hangul-input-method-help-text'."
- (setq inactivate-current-input-method-function 'hangul-input-method-inactivate
+ (setq deactivate-current-input-method-function 'hangul-input-method-deactivate
describe-current-input-method-function 'hangul-input-method-help
hangul-input-method-help-text help-text)
(quail-delete-overlays)
@@ -521,8 +521,8 @@
(add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer))
(set (make-local-variable 'input-method-function) func))
-(defun hangul-input-method-inactivate ()
- "Inactivate the current Hangul input method."
+(defun hangul-input-method-deactivate ()
+ "Deactivate the current Hangul input method."
(interactive)
(unwind-protect
(progn
=== modified file 'leim/quail/uni-input.el'
--- leim/quail/uni-input.el 2011-01-26 08:36:39 +0000
+++ leim/quail/uni-input.el 2011-11-27 23:29:49 +0000
@@ -99,7 +99,7 @@
(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,8 +107,8 @@
(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))
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2011-11-27 08:33:25 +0000
+++ lisp/ChangeLog 2011-11-27 23:29:49 +0000
@@ -1,3 +1,21 @@
+2011-11-27 Paul Eggert <eggert@cs.ucla.edu>
+
+ * 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.
+ * follow.el (follow-inactive-menu): Rename from follow-deactive-menu.
+ * international/mule-cmds.el (deactivate-input-method):
+ Rename from inactivate-input-method.
+ (deactivate-current-input-method-function):
+ Rename from inactivate-current-input-method-function.
+ (input-method-deactivate-hook):
+ Rename from input-method-inactivate-hook.
+ * international/quail.el (quail-deactivate):
+ Rename from quail-inactivate.
+ * international/robin.el (robin-deactivate):
+ Rename from robin-inactivate.
+
2011-11-27 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-mi.el (gdb-init-1): Condition execution of
=== modified file 'lisp/emulation/viper-init.el'
--- lisp/emulation/viper-init.el 2011-11-23 07:03:56 +0000
+++ lisp/emulation/viper-init.el 2011-11-27 23:29:49 +0000
@@ -316,7 +316,7 @@
))
;; viper hook to run on input-method deactivation
-(defun viper-inactivate-input-method-action ()
+(defun viper-deactivate-input-method-action ()
(if (null viper-mule-hook-flag)
()
(setq viper-special-input-method nil)
@@ -328,9 +328,9 @@
(or current-input-method default-input-method))
"")))))
-(defun viper-inactivate-input-method ()
- (cond ((and (featurep 'emacs) (fboundp 'inactivate-input-method))
- (inactivate-input-method))
+(defun viper-deactivate-input-method ()
+ (cond ((and (featurep 'emacs) (fboundp 'deactivate-input-method))
+ (deactivate-input-method))
((and (featurep 'xemacs) (boundp 'current-input-method))
;; XEmacs had broken quail-mode for some time, so we are working around
;; it here
@@ -339,7 +339,7 @@
(quail-delete-overlays))
(setq describe-current-input-method-function nil)
(setq current-input-method nil)
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks 'input-method-deactivate-hook)
(force-mode-line-update))
))
(defun viper-activate-input-method ()
@@ -356,7 +356,7 @@
;; activate input method
(viper-activate-input-method))
(t ; deactivate input method
- (viper-inactivate-input-method)))
+ (viper-deactivate-input-method)))
))
=== modified file 'lisp/emulation/viper.el'
--- lisp/emulation/viper.el 2011-11-19 09:18:31 +0000
+++ lisp/emulation/viper.el 2011-11-27 23:29:49 +0000
@@ -971,9 +971,9 @@
(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 @@
'(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
=== modified file 'lisp/follow.el'
--- lisp/follow.el 2011-11-27 04:43:11 +0000
+++ lisp/follow.el 2011-11-27 23:29:49 +0000
@@ -438,8 +438,8 @@
(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'.
=== modified file 'lisp/international/mule-cmds.el'
--- lisp/international/mule-cmds.el 2011-10-03 14:18:42 +0000
+++ lisp/international/mule-cmds.el 2011-11-27 23:29:49 +0000
@@ -1334,15 +1334,15 @@
(make-variable-buffer-local 'input-method-history)
(put 'input-method-history 'permanent-local t)
-(defvar inactivate-current-input-method-function nil
- "Function to call for inactivating the current input method.
+(defvar deactivate-current-input-method-function nil
+ "Function to call for deactivating the current input method.
Every input method should set this to an appropriate value when activated.
This function is called with no argument.
This function should never change the value of `current-input-method'.
-It is set to nil by the function `inactivate-input-method'.")
-(make-variable-buffer-local 'inactivate-current-input-method-function)
-(put 'inactivate-current-input-method-function 'permanent-local t)
+It is set to nil by the function `deactivate-input-method'.")
+(make-variable-buffer-local 'deactivate-current-input-method-function)
+(put 'deactivate-current-input-method-function 'permanent-local t)
(defvar describe-current-input-method-function nil
"Function to call for describing the current input method.
@@ -1429,7 +1429,7 @@
(setq input-method (symbol-name input-method)))
(if (and current-input-method
(not (string= current-input-method input-method)))
- (inactivate-input-method))
+ (deactivate-input-method))
(unless (or current-input-method (null input-method))
(let ((slot (assoc input-method input-method-alist)))
(if (null slot)
@@ -1450,7 +1450,7 @@
(run-hooks 'input-method-activate-hook)
(force-mode-line-update)))))
-(defun inactivate-input-method ()
+(defun deactivate-input-method ()
"Turn off the current input method."
(when current-input-method
(if input-method-history
@@ -1463,9 +1463,9 @@
(progn
(setq input-method-function nil
current-input-method-title nil)
- (funcall inactivate-current-input-method-function))
+ (funcall deactivate-current-input-method-function))
(unwind-protect
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks 'input-method-deactivate-hook)
(setq current-input-method nil)
(force-mode-line-update)))))
@@ -1479,7 +1479,7 @@
which marks the variable `default-input-method' as set for Custom buffers.
To deactivate the input method interactively, use \\[toggle-input-method].
-To deactivate it programmatically, use `inactivate-input-method'."
+To deactivate it programmatically, use `deactivate-input-method'."
(interactive
(let* ((default (or (car input-method-history) default-input-method)))
(list (read-input-method-name
@@ -1516,7 +1516,7 @@
(if toggle-input-method-active
(error "Recursive use of `toggle-input-method'"))
(if (and current-input-method (not arg))
- (inactivate-input-method)
+ (deactivate-input-method)
(let ((toggle-input-method-active t)
(default (or (car input-method-history) default-input-method)))
(if (and arg default (equal current-input-method default)
@@ -1643,11 +1643,11 @@
:type 'hook
:group 'mule)
-(defcustom input-method-inactivate-hook nil
- "Normal hook run just after an input method is inactivated.
+(defcustom input-method-deactivate-hook nil
+ "Normal hook run just after an input method is deactivated.
The variable `current-input-method' still keeps the input method name
-just inactivated."
+just deactivated."
:type 'hook
:group 'mule)
=== modified file 'lisp/international/quail.el'
--- lisp/international/quail.el 2011-11-18 08:31:02 +0000
+++ lisp/international/quail.el 2011-11-27 23:29:49 +0000
@@ -544,10 +544,10 @@
(if (and (overlayp quail-conv-overlay) (overlay-start quail-conv-overlay))
(delete-overlay quail-conv-overlay)))
-(defun quail-inactivate ()
- "Inactivate Quail input method.
+(defun quail-deactivate ()
+ "Deactivate Quail input method.
-This function runs the normal hook `quail-inactivate-hook'."
+This function runs the normal hook `quail-deactivate-hook'."
(interactive)
(quail-activate -1))
@@ -556,20 +556,20 @@
With ARG, activate Quail input method if and only if arg is positive.
This function runs `quail-activate-hook' if it activates the input
-method, `quail-inactivate-hook' if it deactivates it.
+method, `quail-deactivate-hook' if it deactivates it.
While this input method is active, the variable
`input-method-function' is bound to the function `quail-input-method'."
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; Let's inactivate Quail input method.
+ ;; Let's deactivate Quail input method.
(unwind-protect
(progn
(quail-delete-overlays)
(setq describe-current-input-method-function nil)
(quail-hide-guidance)
(remove-hook 'post-command-hook 'quail-show-guidance t)
- (run-hooks 'quail-inactivate-hook))
+ (run-hooks 'quail-deactivate-hook))
(kill-local-variable 'input-method-function))
;; Let's activate Quail input method.
(if (null quail-current-package)
@@ -579,7 +579,7 @@
(setq name (car (car quail-package-alist)))
(error "No Quail package loaded"))
(quail-select-package name)))
- (setq inactivate-current-input-method-function 'quail-inactivate)
+ (setq deactivate-current-input-method-function 'quail-deactivate)
(setq describe-current-input-method-function 'quail-help)
(quail-delete-overlays)
(setq quail-guidance-str "")
@@ -594,7 +594,7 @@
(setq input-method-function 'quail-input-method)))
(defun quail-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer)))
=== modified file 'lisp/international/robin.el'
--- lisp/international/robin.el 2011-11-13 07:48:23 +0000
+++ lisp/international/robin.el 2011-11-27 23:29:49 +0000
@@ -390,8 +390,8 @@
(setq robin-current-package-name name)
(robin-activate)))
-(defun robin-inactivate ()
- "Inactivate robin input method."
+(defun robin-deactivate ()
+ "Deactivate robin input method."
(interactive)
(robin-activate -1))
@@ -406,18 +406,18 @@
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; inactivate robin input method.
+ ;; deactivate robin input method.
(unwind-protect
(progn
(setq robin-mode nil)
(setq describe-current-input-method-function nil)
- (run-hooks 'robin-inactivate-hook))
+ (run-hooks 'robin-deactivate-hook))
(kill-local-variable 'input-method-function))
;; activate robin input method.
(setq robin-mode t
describe-current-input-method-function 'robin-help
- inactivate-current-input-method-function 'robin-inactivate)
+ deactivate-current-input-method-function 'robin-deactivate)
(if (eq (selected-window) (minibuffer-window))
(add-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer))
(run-hooks 'input-method-activate-hook
@@ -426,7 +426,7 @@
'robin-input-method)))
(defun robin-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer)))
=== modified file 'lisp/language/korea-util.el'
--- lisp/language/korea-util.el 2011-01-26 08:36:39 +0000
+++ lisp/language/korea-util.el 2011-11-27 23:29:49 +0000
@@ -41,7 +41,7 @@
"Turn on or off a Korean text input method for the current buffer."
(interactive)
(if current-input-method
- (inactivate-input-method)
+ (deactivate-input-method)
(activate-input-method
(concat "korean-hangul" default-korean-keyboard))))
=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el 2011-10-15 16:35:19 +0000
+++ lisp/mail/sendmail.el 2011-11-27 23:29:49 +0000
@@ -613,7 +613,7 @@
;; (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)
^ permalink raw reply [flat|nested] 15+ messages in thread* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-27 23:38 bug#10150: deactive->inactive, inactivate->deactivate spelling fixes Paul Eggert
@ 2011-11-28 11:17 ` Štěpán Němec
2011-11-29 8:04 ` Paul Eggert
2011-11-28 20:46 ` Wolfgang Jenkner
` (2 subsequent siblings)
3 siblings, 1 reply; 15+ messages in thread
From: Štěpán Němec @ 2011-11-28 11:17 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150
On Mon, 28 Nov 2011 00:38:47 +0100
Paul Eggert wrote:
> Package: emacs
> Severity: minor
> Tags: patch
>
> Standard English uses the adjective "inactive" and the verb
> "deactivate"; "deactive" and "inactivate" are solecisms.
> Emacs is pretty good about following standard usage but departs
> from it in a few places in the API. Here's a patch. Since we're
> in a feature freeze this should wait until after 24.1 is out.
By renaming functions and variables without any kind of deprecation
procedure (cf. `make-obsolete' and friends), you'd leave users with
customisation and third-party libraries stopping working, with no clue
about what happened. I don't think GNU Emacs maintainer standards have
sunk that low (certainly not for hooks and other identifiers of
immediate interest to all users).
I think this caveat applies to some of your other recent patches as
well, I haven't been following them closely.
--
Štěpán
^ permalink raw reply [flat|nested] 15+ messages in thread* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-28 11:17 ` Štěpán Němec
@ 2011-11-29 8:04 ` Paul Eggert
2011-11-29 11:47 ` Štěpán Němec
[not found] ` <878vmzf8wb.fsf@gmail.com>
0 siblings, 2 replies; 15+ messages in thread
From: Paul Eggert @ 2011-11-29 8:04 UTC (permalink / raw)
To: Štěpán Němec; +Cc: 10150
On 11/28/11 03:17, Štěpán Němec wrote:
> By renaming functions and variables without any kind of deprecation
> procedure (cf. `make-obsolete' and friends),
Sure, we can do deprecation. Is the usual procedure to do this for
all visible symbols, or only for the symbols that are documented
in the manual?
^ permalink raw reply [flat|nested] 15+ messages in thread* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-29 8:04 ` Paul Eggert
@ 2011-11-29 11:47 ` Štěpán Němec
[not found] ` <878vmzf8wb.fsf@gmail.com>
1 sibling, 0 replies; 15+ messages in thread
From: Štěpán Němec @ 2011-11-29 11:47 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150, emacs-devel
On Tue, 29 Nov 2011 09:04:57 +0100
Paul Eggert wrote:
> On 11/28/11 03:17, Štěpán Němec wrote:
>> By renaming functions and variables without any kind of deprecation
>> procedure (cf. `make-obsolete' and friends),
>
> Sure, we can do deprecation. Is the usual procedure to do this for
> all visible symbols, or only for the symbols that are documented
> in the manual?
You'd have to ask the maintainers for the definitive answer (emacs-devel
added to the Cc: list); I think it's usually closer to the latter.
IMO all commands, hooks and user variables definitely need deprecation,
the rest should at least be mentioned in NEWS.
--
Štěpán
^ permalink raw reply [flat|nested] 15+ messages in thread[parent not found: <878vmzf8wb.fsf@gmail.com>]
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
[not found] ` <878vmzf8wb.fsf@gmail.com>
@ 2011-12-31 6:12 ` Paul Eggert
2012-01-03 16:55 ` Štěpán Němec
0 siblings, 1 reply; 15+ messages in thread
From: Paul Eggert @ 2011-12-31 6:12 UTC (permalink / raw)
To: Štěpán Němec; +Cc: 10150
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
On 11/29/11 03:47, Štěpán Němec wrote:
> IMO all commands, hooks and user variables definitely need deprecation,
> the rest should at least be mentioned in NEWS.
OK, thanks, attached is an improved version of the patch that
should do all that. I'll also look at improving the
other patches I recently submitted re fixing spelling
problems in the code.
[-- Attachment #2: deactive.txt --]
[-- Type: text/plain, Size: 17620 bytes --]
=== modified file 'etc/NEWS'
--- etc/NEWS 2011-12-30 10:19:42 +0000
+++ etc/NEWS 2011-12-31 06:07:08 +0000
@@ -22,6 +22,48 @@
so we will look at it and add it to the manual.
\f
+* Incompatible Lisp Changes in Emacs 25.1
+
+** Spelling changes.
+Several Lisp symbols have been renamed to avoid problems with spelling
+that is incorrect or inconsistent with how Emacs normally spells a word.
+
+*** Renamed functions
+
+**** hangul-input-method-inactivate ->
+ hangul-input-method-deactivate
+**** inactivate-input-method ->
+ deactivate-input-method
+**** quail-inactivate ->
+ quail-deactivate
+**** robin-inactivate ->
+ robin-deactivate
+**** viper-inactivate-input-method ->
+ viper-deactivate-input-method
+**** viper-inactivate-input-method-action ->
+ viper-deactivate-input-method-action
+**** ucs-input-inactivate ->
+ ucs-input-deactivate
+
+*** Renamed hooks
+The old hooks are still supported for backward compatibility, but they
+are deprecated and will be removed eventually.
+
+**** input-method-inactivate-hook ->
+ input-method-deactivate-hook
+**** robin-inactivate-hook ->
+ robin-deactivate-hook
+**** quail-inactivate-hook ->
+ quail-deactivate-hook
+
+*** Renamed Lisp variables
+
+**** follow-deactive-menu ->
+ follow-inactive-menu
+**** inactivate-current-input-method-function ->
+ deactivate-current-input-method-function
+
+
* Installation Changes in Emacs 24.1
** Configure links against libselinux if it is found.
=== modified file 'leim/ChangeLog'
--- leim/ChangeLog 2011-12-19 06:21:24 +0000
+++ leim/ChangeLog 2011-12-31 06:07:08 +0000
@@ -1,3 +1,10 @@
+2011-12-31 Paul Eggert <eggert@cs.ucla.edu>
+
+ * quail/uni-input.el (ucs-input-deactivate):
+ Rename from ucs-input-inactivate.
+ * quail/hangul.el (hangul-input-method-deactivate):
+ Rename from hangul-input-method-inactivate.
+
2011-12-15 Kenichi Handa <handa@m17n.org>
* quail/ethiopic.el ("ethiopic"): Do not refer to
=== modified file 'leim/quail/hangul.el'
--- leim/quail/hangul.el 2011-11-20 19:35:27 +0000
+++ leim/quail/hangul.el 2011-12-31 06:07:08 +0000
@@ -513,7 +513,7 @@
"Activate Hangul input method INPUT-METHOD.
FUNC is a function to handle input key.
HELP-TEXT is a text set in `hangul-input-method-help-text'."
- (setq inactivate-current-input-method-function 'hangul-input-method-inactivate
+ (setq deactivate-current-input-method-function 'hangul-input-method-deactivate
describe-current-input-method-function 'hangul-input-method-help
hangul-input-method-help-text help-text)
(quail-delete-overlays)
@@ -521,8 +521,8 @@
(add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer))
(set (make-local-variable 'input-method-function) func))
-(defun hangul-input-method-inactivate ()
- "Inactivate the current Hangul input method."
+(defun hangul-input-method-deactivate ()
+ "Deactivate the current Hangul input method."
(interactive)
(unwind-protect
(progn
=== modified file 'leim/quail/uni-input.el'
--- leim/quail/uni-input.el 2011-01-26 08:36:39 +0000
+++ leim/quail/uni-input.el 2011-12-31 06:07:08 +0000
@@ -99,7 +99,7 @@
(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,8 +107,8 @@
(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))
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2011-12-29 13:12:18 +0000
+++ lisp/ChangeLog 2011-12-31 06:07:08 +0000
@@ -1,3 +1,24 @@
+2011-12-31 Paul Eggert <eggert@cs.ucla.edu>
+
+ * 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.
+ * follow.el (follow-inactive-menu): Rename from follow-deactive-menu.
+ * 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.
+ * international/quail.el (quail-activate):
+ Also run quail-deactivate-hook.
+ (quail-deactivate): Rename from quail-inactivate.
+ * international/robin.el (robin-activate):
+ Also run robin-deactivate-hook.
+ (robin-deactivate): Rename from robin-inactivate.
+
2011-12-29 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property
=== modified file 'lisp/emulation/viper-init.el'
--- lisp/emulation/viper-init.el 2011-12-04 08:02:42 +0000
+++ lisp/emulation/viper-init.el 2011-12-31 06:07:08 +0000
@@ -316,7 +316,7 @@
))
;; viper hook to run on input-method deactivation
-(defun viper-inactivate-input-method-action ()
+(defun viper-deactivate-input-method-action ()
(if (null viper-mule-hook-flag)
()
(setq viper-special-input-method nil)
@@ -328,9 +328,9 @@
(or current-input-method default-input-method))
"")))))
-(defun viper-inactivate-input-method ()
- (cond ((and (featurep 'emacs) (fboundp 'inactivate-input-method))
- (inactivate-input-method))
+(defun viper-deactivate-input-method ()
+ (cond ((and (featurep 'emacs) (fboundp 'deactivate-input-method))
+ (deactivate-input-method))
((and (featurep 'xemacs) (boundp 'current-input-method))
;; XEmacs had broken quail-mode for some time, so we are working around
;; it here
@@ -339,7 +339,9 @@
(quail-delete-overlays))
(setq describe-current-input-method-function nil)
(setq current-input-method nil)
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks
+ 'input-method-inactivate-hook ; for backward compatibility
+ 'input-method-deactivate-hook)
(force-mode-line-update))
))
(defun viper-activate-input-method ()
@@ -356,7 +358,7 @@
;; activate input method
(viper-activate-input-method))
(t ; deactivate input method
- (viper-inactivate-input-method)))
+ (viper-deactivate-input-method)))
))
=== modified file 'lisp/emulation/viper.el'
--- lisp/emulation/viper.el 2011-12-04 08:02:42 +0000
+++ lisp/emulation/viper.el 2011-12-31 06:07:08 +0000
@@ -971,9 +971,9 @@
(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 @@
'(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
=== modified file 'lisp/follow.el'
--- lisp/follow.el 2011-12-04 08:02:42 +0000
+++ lisp/follow.el 2011-12-31 06:07:08 +0000
@@ -438,8 +438,8 @@
(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'.
=== modified file 'lisp/international/mule-cmds.el'
--- lisp/international/mule-cmds.el 2011-12-17 06:51:13 +0000
+++ lisp/international/mule-cmds.el 2011-12-31 06:07:08 +0000
@@ -1334,15 +1334,15 @@
(make-variable-buffer-local 'input-method-history)
(put 'input-method-history 'permanent-local t)
-(defvar inactivate-current-input-method-function nil
- "Function to call for inactivating the current input method.
+(defvar deactivate-current-input-method-function nil
+ "Function to call for deactivating the current input method.
Every input method should set this to an appropriate value when activated.
This function is called with no argument.
This function should never change the value of `current-input-method'.
-It is set to nil by the function `inactivate-input-method'.")
-(make-variable-buffer-local 'inactivate-current-input-method-function)
-(put 'inactivate-current-input-method-function 'permanent-local t)
+It is set to nil by the function `deactivate-input-method'.")
+(make-variable-buffer-local 'deactivate-current-input-method-function)
+(put 'deactivate-current-input-method-function 'permanent-local t)
(defvar describe-current-input-method-function nil
"Function to call for describing the current input method.
@@ -1429,7 +1429,7 @@
(setq input-method (symbol-name input-method)))
(if (and current-input-method
(not (string= current-input-method input-method)))
- (inactivate-input-method))
+ (deactivate-input-method))
(unless (or current-input-method (null input-method))
(let ((slot (assoc input-method input-method-alist)))
(if (null slot)
@@ -1450,7 +1450,7 @@
(run-hooks 'input-method-activate-hook)
(force-mode-line-update)))))
-(defun inactivate-input-method ()
+(defun deactivate-input-method ()
"Turn off the current input method."
(when current-input-method
(if input-method-history
@@ -1463,9 +1463,11 @@
(progn
(setq input-method-function nil
current-input-method-title nil)
- (funcall inactivate-current-input-method-function))
+ (funcall deactivate-current-input-method-function))
(unwind-protect
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks
+ 'input-method-inactivate-hook ; for backward compatibility
+ 'input-method-deactivate-hook)
(setq current-input-method nil)
(force-mode-line-update)))))
@@ -1479,7 +1481,7 @@
which marks the variable `default-input-method' as set for Custom buffers.
To deactivate the input method interactively, use \\[toggle-input-method].
-To deactivate it programmatically, use `inactivate-input-method'."
+To deactivate it programmatically, use `deactivate-input-method'."
(interactive
(let* ((default (or (car input-method-history) default-input-method)))
(list (read-input-method-name
@@ -1516,7 +1518,7 @@
(if toggle-input-method-active
(error "Recursive use of `toggle-input-method'"))
(if (and current-input-method (not arg))
- (inactivate-input-method)
+ (deactivate-input-method)
(let ((toggle-input-method-active t)
(default (or (car input-method-history) default-input-method)))
(if (and arg default (equal current-input-method default)
@@ -1643,13 +1645,20 @@
:type 'hook
:group 'mule)
+(defcustom input-method-deactivate-hook nil
+ "Normal hook run just after an input method is deactivated.
+
+The variable `current-input-method' still keeps the input method name
+just deactivated."
+ :type 'hook
+ :group 'mule)
+
(defcustom input-method-inactivate-hook nil
- "Normal hook run just after an input method is inactivated.
-
-The variable `current-input-method' still keeps the input method name
-just inactivated."
+ "Normal hook run just after an input method is deactivated."
:type 'hook
:group 'mule)
+(make-obsolete-variable 'input-method-inactivate-hook
+ 'input-method-deactivate-hook "25.1")
(defcustom input-method-after-insert-chunk-hook nil
"Normal hook run just after an input method insert some chunk of text."
=== modified file 'lisp/international/quail.el'
--- lisp/international/quail.el 2011-12-15 07:24:10 +0000
+++ lisp/international/quail.el 2011-12-31 06:07:08 +0000
@@ -544,10 +544,10 @@
(if (and (overlayp quail-conv-overlay) (overlay-start quail-conv-overlay))
(delete-overlay quail-conv-overlay)))
-(defun quail-inactivate ()
- "Inactivate Quail input method.
+(defun quail-deactivate ()
+ "Deactivate Quail input method.
-This function runs the normal hook `quail-inactivate-hook'."
+This function runs the normal hook `quail-deactivate-hook'."
(interactive)
(quail-activate -1))
@@ -556,20 +556,22 @@
With ARG, activate Quail input method if and only if arg is positive.
This function runs `quail-activate-hook' if it activates the input
-method, `quail-inactivate-hook' if it deactivates it.
+method, `quail-deactivate-hook' if it deactivates it.
While this input method is active, the variable
`input-method-function' is bound to the function `quail-input-method'."
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; Let's inactivate Quail input method.
+ ;; Let's deactivate Quail input method.
(unwind-protect
(progn
(quail-delete-overlays)
(setq describe-current-input-method-function nil)
(quail-hide-guidance)
(remove-hook 'post-command-hook 'quail-show-guidance t)
- (run-hooks 'quail-inactivate-hook))
+ (run-hooks
+ 'quail-inactivate-hook ; for backward compatibility
+ 'quail-deactivate-hook))
(kill-local-variable 'input-method-function))
;; Let's activate Quail input method.
(if (null quail-current-package)
@@ -579,7 +581,7 @@
(setq name (car (car quail-package-alist)))
(error "No Quail package loaded"))
(quail-select-package name)))
- (setq inactivate-current-input-method-function 'quail-inactivate)
+ (setq deactivate-current-input-method-function 'quail-deactivate)
(setq describe-current-input-method-function 'quail-help)
(quail-delete-overlays)
(setq quail-guidance-str "")
@@ -593,8 +595,11 @@
(make-local-variable 'input-method-function)
(setq input-method-function 'quail-input-method)))
+(make-obsolete-variable 'quail-inactivate-hook
+ 'quail-deactivate-hook "25.1")
+
(defun quail-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer)))
=== modified file 'lisp/international/robin.el'
--- lisp/international/robin.el 2011-12-21 09:58:39 +0000
+++ lisp/international/robin.el 2011-12-31 06:07:08 +0000
@@ -390,8 +390,8 @@
(setq robin-current-package-name name)
(robin-activate)))
-(defun robin-inactivate ()
- "Inactivate robin input method."
+(defun robin-deactivate ()
+ "Deactivate robin input method."
(interactive)
(robin-activate -1))
@@ -406,18 +406,20 @@
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; inactivate robin input method.
+ ;; deactivate robin input method.
(unwind-protect
(progn
(setq robin-mode nil)
(setq describe-current-input-method-function nil)
- (run-hooks 'robin-inactivate-hook))
+ (run-hooks
+ 'robin-inactivate-hook ; for backward compatibility
+ 'robin-deactivate-hook))
(kill-local-variable 'input-method-function))
;; activate robin input method.
(setq robin-mode t
describe-current-input-method-function 'robin-help
- inactivate-current-input-method-function 'robin-inactivate)
+ deactivate-current-input-method-function 'robin-deactivate)
(if (eq (selected-window) (minibuffer-window))
(add-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer))
(run-hooks 'input-method-activate-hook
@@ -425,8 +427,11 @@
(set (make-local-variable 'input-method-function)
'robin-input-method)))
+(make-obsolete-variable 'robin-inactivate-hook
+ 'robin-deactivate-hook "25.1")
+
(defun robin-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer)))
=== modified file 'lisp/language/korea-util.el'
--- lisp/language/korea-util.el 2011-01-26 08:36:39 +0000
+++ lisp/language/korea-util.el 2011-12-31 06:07:08 +0000
@@ -41,7 +41,7 @@
"Turn on or off a Korean text input method for the current buffer."
(interactive)
(if current-input-method
- (inactivate-input-method)
+ (deactivate-input-method)
(activate-input-method
(concat "korean-hangul" default-korean-keyboard))))
=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el 2011-10-15 16:35:19 +0000
+++ lisp/mail/sendmail.el 2011-12-31 06:07:08 +0000
@@ -613,7 +613,7 @@
;; (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)
^ permalink raw reply [flat|nested] 15+ messages in thread* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-12-31 6:12 ` Paul Eggert
@ 2012-01-03 16:55 ` Štěpán Němec
2012-01-12 8:12 ` Paul Eggert
0 siblings, 1 reply; 15+ messages in thread
From: Štěpán Němec @ 2012-01-03 16:55 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150
On Sat, 31 Dec 2011 07:12:26 +0100
Paul Eggert wrote:
> On 11/29/11 03:47, Štěpán Němec wrote:
>> IMO all commands, hooks and user variables definitely need deprecation,
>> the rest should at least be mentioned in NEWS.
>
> OK, thanks, attached is an improved version of the patch that
> should do all that. I'll also look at improving the
> other patches I recently submitted re fixing spelling
> problems in the code.
Thank you!
Several problems I noticed:
1) `hangul-input-method-inactivate', `quail-inactivate',
`robin-inactivate' and `ucs-input-inactivate' are all interactive
functions (= commands), but you still just rename them without any
deprecation (cf. `define-obsolete-function-alias').
2) You only use `make-obsolete-variable' to mark user variables obsolete
(and retain both the original and the new defcustoms), which will
produce compiler warnings for the old variable, but doesn't provide any
clear connection between the two. It would be better to use
`define-obsolete-variable-alias' (which presumably also prevents other
problems, see its docstring) and only use `defcustom' for the new
variable(s).
3) The new or changed `defcustoms' should get a :version tag.
--
Štěpán
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2012-01-03 16:55 ` Štěpán Němec
@ 2012-01-12 8:12 ` Paul Eggert
2012-01-12 16:08 ` Štěpán Němec
0 siblings, 1 reply; 15+ messages in thread
From: Paul Eggert @ 2012-01-12 8:12 UTC (permalink / raw)
To: Štěpán Němec; +Cc: 10150
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
On 01/03/12 08:55, Štěpán Němec wrote:
> Several problems I noticed:
Thanks for the careful review. I'm attaching a revised patch
which I hope addresses all the points you made.
[-- Attachment #2: deactive-v2.txt --]
[-- Type: text/plain, Size: 18959 bytes --]
=== modified file 'etc/NEWS'
--- etc/NEWS 2012-01-12 07:18:08 +0000
+++ etc/NEWS 2012-01-12 08:09:49 +0000
@@ -22,6 +22,48 @@
so we will look at it and add it to the manual.
\f
+* Incompatible Lisp Changes in Emacs 25.1
+
+** Spelling changes.
+Several Lisp symbols have been renamed to avoid problems with spelling
+that is incorrect or inconsistent with how Emacs normally spells a word.
+
+*** Renamed functions
+
+**** hangul-input-method-inactivate ->
+ hangul-input-method-deactivate
+**** inactivate-input-method ->
+ deactivate-input-method
+**** quail-inactivate ->
+ quail-deactivate
+**** robin-inactivate ->
+ robin-deactivate
+**** viper-inactivate-input-method ->
+ viper-deactivate-input-method
+**** viper-inactivate-input-method-action ->
+ viper-deactivate-input-method-action
+**** ucs-input-inactivate ->
+ ucs-input-deactivate
+
+*** Renamed hooks
+The old hooks are still supported for backward compatibility, but they
+are deprecated and will be removed eventually.
+
+**** input-method-inactivate-hook ->
+ input-method-deactivate-hook
+**** robin-inactivate-hook ->
+ robin-deactivate-hook
+**** quail-inactivate-hook ->
+ quail-deactivate-hook
+
+*** Renamed Lisp variables
+
+**** follow-deactive-menu ->
+ follow-inactive-menu
+**** inactivate-current-input-method-function ->
+ deactivate-current-input-method-function
+
+
* Installation Changes in Emacs 24.1
** Configure links against libselinux if it is found.
=== modified file 'leim/ChangeLog'
--- leim/ChangeLog 2012-01-12 07:18:08 +0000
+++ leim/ChangeLog 2012-01-12 08:09:49 +0000
@@ -1,3 +1,11 @@
+2012-01-12 Paul Eggert <eggert@cs.ucla.edu>
+
+ deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)
+ * quail/uni-input.el (ucs-input-deactivate):
+ Rename from ucs-input-inactivate.
+ * quail/hangul.el (hangul-input-method-deactivate):
+ Rename from hangul-input-method-inactivate.
+
2011-12-15 Kenichi Handa <handa@m17n.org>
* quail/ethiopic.el ("ethiopic"): Do not refer to
=== modified file 'leim/quail/hangul.el'
--- leim/quail/hangul.el 2012-01-12 07:18:08 +0000
+++ leim/quail/hangul.el 2012-01-12 08:09:49 +0000
@@ -513,7 +513,7 @@
"Activate Hangul input method INPUT-METHOD.
FUNC is a function to handle input key.
HELP-TEXT is a text set in `hangul-input-method-help-text'."
- (setq inactivate-current-input-method-function 'hangul-input-method-inactivate
+ (setq deactivate-current-input-method-function 'hangul-input-method-deactivate
describe-current-input-method-function 'hangul-input-method-help
hangul-input-method-help-text help-text)
(quail-delete-overlays)
@@ -521,8 +521,8 @@
(add-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer))
(set (make-local-variable 'input-method-function) func))
-(defun hangul-input-method-inactivate ()
- "Inactivate the current Hangul input method."
+(defun hangul-input-method-deactivate ()
+ "Deactivate the current Hangul input method."
(interactive)
(unwind-protect
(progn
@@ -531,6 +531,10 @@
(setq describe-current-input-method-function nil))
(kill-local-variable 'input-method-function)))
+(define-obsolete-function-alias
+ 'hangul-input-method-inactivate
+ 'hangul-input-method-deactivate "25.1")
+
(defun hangul-input-method-help ()
"Describe the current Hangul input method."
(interactive)
=== modified file 'leim/quail/uni-input.el'
--- leim/quail/uni-input.el 2012-01-12 07:18:08 +0000
+++ leim/quail/uni-input.el 2012-01-12 08:09:49 +0000
@@ -99,7 +99,7 @@
(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 @@
(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 "25.1")
+
(defun ucs-input-help ()
(interactive)
(with-output-to-temp-buffer "*Help*"
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog 2012-01-12 07:18:08 +0000
+++ lisp/ChangeLog 2012-01-12 08:09:49 +0000
@@ -1,5 +1,25 @@
2012-01-12 Paul Eggert <eggert@cs.ucla.edu>
+ deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)
+ * 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.
+ * follow.el (follow-inactive-menu): Rename from follow-deactive-menu.
+ * 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.
+ * international/quail.el (quail-activate):
+ Also run quail-deactivate-hook.
+ (quail-deactivate): Rename from quail-inactivate.
+ * international/robin.el (robin-activate):
+ Also run robin-deactivate-hook.
+ (robin-deactivate): Rename from robin-inactivate.
+
Consistently use the spelling "color" (Bug#10069).
* hfy-cmap.el (hfy-fallback-color-map):
Rename from hfy-fallback-colour-map.
=== modified file 'lisp/emulation/viper-init.el'
--- lisp/emulation/viper-init.el 2012-01-12 07:18:08 +0000
+++ lisp/emulation/viper-init.el 2012-01-12 08:09:49 +0000
@@ -316,7 +316,7 @@
))
;; viper hook to run on input-method deactivation
-(defun viper-inactivate-input-method-action ()
+(defun viper-deactivate-input-method-action ()
(if (null viper-mule-hook-flag)
()
(setq viper-special-input-method nil)
@@ -328,9 +328,9 @@
(or current-input-method default-input-method))
"")))))
-(defun viper-inactivate-input-method ()
- (cond ((and (featurep 'emacs) (fboundp 'inactivate-input-method))
- (inactivate-input-method))
+(defun viper-deactivate-input-method ()
+ (cond ((and (featurep 'emacs) (fboundp 'deactivate-input-method))
+ (deactivate-input-method))
((and (featurep 'xemacs) (boundp 'current-input-method))
;; XEmacs had broken quail-mode for some time, so we are working around
;; it here
@@ -339,7 +339,9 @@
(quail-delete-overlays))
(setq describe-current-input-method-function nil)
(setq current-input-method nil)
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks
+ 'input-method-inactivate-hook ; for backward compatibility
+ 'input-method-deactivate-hook)
(force-mode-line-update))
))
(defun viper-activate-input-method ()
@@ -356,7 +358,7 @@
;; activate input method
(viper-activate-input-method))
(t ; deactivate input method
- (viper-inactivate-input-method)))
+ (viper-deactivate-input-method)))
))
=== modified file 'lisp/emulation/viper.el'
--- lisp/emulation/viper.el 2012-01-12 07:18:08 +0000
+++ lisp/emulation/viper.el 2012-01-12 08:09:49 +0000
@@ -971,9 +971,9 @@
(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 @@
'(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
=== modified file 'lisp/follow.el'
--- lisp/follow.el 2012-01-12 07:18:08 +0000
+++ lisp/follow.el 2012-01-12 08:09:49 +0000
@@ -438,8 +438,8 @@
(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'.
=== modified file 'lisp/htmlfontify.el'
--- lisp/htmlfontify.el 2012-01-12 07:13:01 +0000
+++ lisp/htmlfontify.el 2012-01-12 08:09:49 +0000
@@ -2316,7 +2316,7 @@
\f
;;;### (autoloads (hfy-fallback-color-values htmlfontify-load-rgb-file)
-;;;;;; "hfy-cmap" "hfy-cmap.el" "ef24066922f1e27b7580d572f12fabbe")
+;;;;;; "hfy-cmap" "hfy-cmap.el" "910c380b9538f6880baf2732e73bb376")
;;; Generated autoloads from hfy-cmap.el
(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
=== modified file 'lisp/international/mule-cmds.el'
--- lisp/international/mule-cmds.el 2012-01-12 07:18:08 +0000
+++ lisp/international/mule-cmds.el 2012-01-12 08:09:49 +0000
@@ -1334,15 +1334,15 @@
(make-variable-buffer-local 'input-method-history)
(put 'input-method-history 'permanent-local t)
-(defvar inactivate-current-input-method-function nil
- "Function to call for inactivating the current input method.
+(defvar deactivate-current-input-method-function nil
+ "Function to call for deactivating the current input method.
Every input method should set this to an appropriate value when activated.
This function is called with no argument.
This function should never change the value of `current-input-method'.
-It is set to nil by the function `inactivate-input-method'.")
-(make-variable-buffer-local 'inactivate-current-input-method-function)
-(put 'inactivate-current-input-method-function 'permanent-local t)
+It is set to nil by the function `deactivate-input-method'.")
+(make-variable-buffer-local 'deactivate-current-input-method-function)
+(put 'deactivate-current-input-method-function 'permanent-local t)
(defvar describe-current-input-method-function nil
"Function to call for describing the current input method.
@@ -1429,7 +1429,7 @@
(setq input-method (symbol-name input-method)))
(if (and current-input-method
(not (string= current-input-method input-method)))
- (inactivate-input-method))
+ (deactivate-input-method))
(unless (or current-input-method (null input-method))
(let ((slot (assoc input-method input-method-alist)))
(if (null slot)
@@ -1450,7 +1450,7 @@
(run-hooks 'input-method-activate-hook)
(force-mode-line-update)))))
-(defun inactivate-input-method ()
+(defun deactivate-input-method ()
"Turn off the current input method."
(when current-input-method
(if input-method-history
@@ -1463,9 +1463,11 @@
(progn
(setq input-method-function nil
current-input-method-title nil)
- (funcall inactivate-current-input-method-function))
+ (funcall deactivate-current-input-method-function))
(unwind-protect
- (run-hooks 'input-method-inactivate-hook)
+ (run-hooks
+ 'input-method-inactivate-hook ; for backward compatibility
+ 'input-method-deactivate-hook)
(setq current-input-method nil)
(force-mode-line-update)))))
@@ -1479,7 +1481,7 @@
which marks the variable `default-input-method' as set for Custom buffers.
To deactivate the input method interactively, use \\[toggle-input-method].
-To deactivate it programmatically, use `inactivate-input-method'."
+To deactivate it programmatically, use `deactivate-input-method'."
(interactive
(let* ((default (or (car input-method-history) default-input-method)))
(list (read-input-method-name
@@ -1516,7 +1518,7 @@
(if toggle-input-method-active
(error "Recursive use of `toggle-input-method'"))
(if (and current-input-method (not arg))
- (inactivate-input-method)
+ (deactivate-input-method)
(let ((toggle-input-method-active t)
(default (or (car input-method-history) default-input-method)))
(if (and arg default (equal current-input-method default)
@@ -1643,13 +1645,18 @@
:type 'hook
:group 'mule)
-(defcustom input-method-inactivate-hook nil
- "Normal hook run just after an input method is inactivated.
+(define-obsolete-variable-alias
+ 'input-method-inactivate-hook
+ 'input-method-deactivate-hook "25.1")
+
+(defcustom input-method-deactivate-hook nil
+ "Normal hook run just after an input method is deactivated.
The variable `current-input-method' still keeps the input method name
-just inactivated."
+just deactivated."
:type 'hook
- :group 'mule)
+ :group 'mule
+ :version "25.1")
(defcustom input-method-after-insert-chunk-hook nil
"Normal hook run just after an input method insert some chunk of text."
=== modified file 'lisp/international/quail.el'
--- lisp/international/quail.el 2012-01-12 07:18:08 +0000
+++ lisp/international/quail.el 2012-01-12 08:09:49 +0000
@@ -544,32 +544,36 @@
(if (and (overlayp quail-conv-overlay) (overlay-start quail-conv-overlay))
(delete-overlay quail-conv-overlay)))
-(defun quail-inactivate ()
- "Inactivate Quail input method.
+(defun quail-deactivate ()
+ "Deactivate Quail input method.
-This function runs the normal hook `quail-inactivate-hook'."
+This function runs the normal hook `quail-deactivate-hook'."
(interactive)
(quail-activate -1))
+(define-obsolete-function-alias 'quail-inactivate 'quail-deactivate "25.1")
+
(defun quail-activate (&optional arg)
"Activate Quail input method.
With ARG, activate Quail input method if and only if arg is positive.
This function runs `quail-activate-hook' if it activates the input
-method, `quail-inactivate-hook' if it deactivates it.
+method, `quail-deactivate-hook' if it deactivates it.
While this input method is active, the variable
`input-method-function' is bound to the function `quail-input-method'."
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; Let's inactivate Quail input method.
+ ;; Let's deactivate Quail input method.
(unwind-protect
(progn
(quail-delete-overlays)
(setq describe-current-input-method-function nil)
(quail-hide-guidance)
(remove-hook 'post-command-hook 'quail-show-guidance t)
- (run-hooks 'quail-inactivate-hook))
+ (run-hooks
+ 'quail-inactivate-hook ; for backward compatibility
+ 'quail-deactivate-hook))
(kill-local-variable 'input-method-function))
;; Let's activate Quail input method.
(if (null quail-current-package)
@@ -579,7 +583,7 @@
(setq name (car (car quail-package-alist)))
(error "No Quail package loaded"))
(quail-select-package name)))
- (setq inactivate-current-input-method-function 'quail-inactivate)
+ (setq deactivate-current-input-method-function 'quail-deactivate)
(setq describe-current-input-method-function 'quail-help)
(quail-delete-overlays)
(setq quail-guidance-str "")
@@ -593,8 +597,12 @@
(make-local-variable 'input-method-function)
(setq input-method-function 'quail-input-method)))
+(define-obsolete-variable-alias
+ 'quail-inactivate-hook
+ 'quail-deactivate-hook "25.1")
+
(defun quail-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'quail-exit-from-minibuffer)))
=== modified file 'lisp/international/robin.el'
--- lisp/international/robin.el 2012-01-12 07:18:08 +0000
+++ lisp/international/robin.el 2012-01-12 08:09:49 +0000
@@ -390,12 +390,14 @@
(setq robin-current-package-name name)
(robin-activate)))
-(defun robin-inactivate ()
- "Inactivate robin input method."
+(defun robin-deactivate ()
+ "Deactivate robin input method."
(interactive)
(robin-activate -1))
+(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "25.1")
+
(defun robin-activate (&optional arg)
"Activate robin input method.
@@ -406,18 +408,20 @@
(if (and arg
(< (prefix-numeric-value arg) 0))
- ;; inactivate robin input method.
+ ;; deactivate robin input method.
(unwind-protect
(progn
(setq robin-mode nil)
(setq describe-current-input-method-function nil)
- (run-hooks 'robin-inactivate-hook))
+ (run-hooks
+ 'robin-inactivate-hook ; for backward compatibility
+ 'robin-deactivate-hook))
(kill-local-variable 'input-method-function))
;; activate robin input method.
(setq robin-mode t
describe-current-input-method-function 'robin-help
- inactivate-current-input-method-function 'robin-inactivate)
+ deactivate-current-input-method-function 'robin-deactivate)
(if (eq (selected-window) (minibuffer-window))
(add-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer))
(run-hooks 'input-method-activate-hook
@@ -425,8 +429,12 @@
(set (make-local-variable 'input-method-function)
'robin-input-method)))
+(define-obsolete-variable-alias
+ 'robin-inactivate-hook
+ 'robin-deactivate-hook "25.1")
+
(defun robin-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(if (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer)))
=== modified file 'lisp/language/korea-util.el'
--- lisp/language/korea-util.el 2012-01-12 07:18:08 +0000
+++ lisp/language/korea-util.el 2012-01-12 08:09:49 +0000
@@ -41,7 +41,7 @@
"Turn on or off a Korean text input method for the current buffer."
(interactive)
(if current-input-method
- (inactivate-input-method)
+ (deactivate-input-method)
(activate-input-method
(concat "korean-hangul" default-korean-keyboard))))
=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el 2012-01-12 07:18:08 +0000
+++ lisp/mail/sendmail.el 2012-01-12 08:09:49 +0000
@@ -613,7 +613,7 @@
;; (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)
^ permalink raw reply [flat|nested] 15+ messages in thread* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2012-01-12 8:12 ` Paul Eggert
@ 2012-01-12 16:08 ` Štěpán Němec
0 siblings, 0 replies; 15+ messages in thread
From: Štěpán Němec @ 2012-01-12 16:08 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150
On Thu, 12 Jan 2012 09:12:29 +0100
Paul Eggert wrote:
> On 01/03/12 08:55, Štěpán Němec wrote:
>> Several problems I noticed:
>
> Thanks for the careful review. I'm attaching a revised patch
> which I hope addresses all the points you made.
Looks OK to me, thank you.
--
Štěpán
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-27 23:38 bug#10150: deactive->inactive, inactivate->deactivate spelling fixes Paul Eggert
2011-11-28 11:17 ` Štěpán Němec
@ 2011-11-28 20:46 ` Wolfgang Jenkner
2011-11-29 4:52 ` Chong Yidong
2011-11-29 8:33 ` Paul Eggert
2012-07-29 7:19 ` Paul Eggert
2012-08-02 0:51 ` Katsumi Yamaoka
3 siblings, 2 replies; 15+ messages in thread
From: Wolfgang Jenkner @ 2011-11-28 20:46 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150
Paul Eggert <eggert@cs.ucla.edu> writes:
> Standard English uses the adjective "inactive" and the verb
> "deactivate"; "deactive" and "inactivate" are solecisms.
Actually, at least the Longman Dictionary of the English Language (2nd
ed. 1991) contains
inactivate vt to make inactive - inactivation n
without any kind of restriction in usage or register.
Wolfgang
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-28 20:46 ` Wolfgang Jenkner
@ 2011-11-29 4:52 ` Chong Yidong
2011-11-29 15:37 ` Drew Adams
2011-11-29 8:33 ` Paul Eggert
1 sibling, 1 reply; 15+ messages in thread
From: Chong Yidong @ 2011-11-29 4:52 UTC (permalink / raw)
To: Wolfgang Jenkner; +Cc: 10150, Paul Eggert
Wolfgang Jenkner <wjenkner@inode.at> writes:
> Paul Eggert <eggert@cs.ucla.edu> writes:
>
>> Standard English uses the adjective "inactive" and the verb
>> "deactivate"; "deactive" and "inactivate" are solecisms.
>
> Actually, at least the Longman Dictionary of the English Language (2nd
> ed. 1991) contains
>
> inactivate vt to make inactive - inactivation n
>
> without any kind of restriction in usage or register.
Right. So the only thing that actually needs a fix is
follow-deactive-menu.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-29 4:52 ` Chong Yidong
@ 2011-11-29 15:37 ` Drew Adams
0 siblings, 0 replies; 15+ messages in thread
From: Drew Adams @ 2011-11-29 15:37 UTC (permalink / raw)
To: 'Chong Yidong', 'Wolfgang Jenkner'
Cc: 10150, 'Paul Eggert'
> > inactivate vt to make inactive - inactivation n
>
> Right. So the only thing that actually needs a fix is
> follow-deactive-menu.
"Needs", perhaps, if the argument is only wrt English usage and not software use
and maintenance. I agree that the word "inactivate" is not inappropriate. (It
has the additional advantage of being similar to the term used for this in some
other languages.)
However, it also makes sense for Emacs to pick one term for this and stick to
it. I suggest moving to "deactivate" everywhere, but of course by proper
aliasing and deprecation, and with no hurry to desupport the deprecated names
(no need).
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-28 20:46 ` Wolfgang Jenkner
2011-11-29 4:52 ` Chong Yidong
@ 2011-11-29 8:33 ` Paul Eggert
1 sibling, 0 replies; 15+ messages in thread
From: Paul Eggert @ 2011-11-29 8:33 UTC (permalink / raw)
To: Wolfgang Jenkner; +Cc: 10150
On 11/28/11 12:46, Wolfgang Jenkner wrote:
> the Longman Dictionary of the English Language (2nd
> ed. 1991) contains
I stand corrected.
Still, it's confusing that Emacs typically uses "deactivate",
(e.g., deactivate-mark) but sometimes employs "inactivate" instead.
A quick estimation shows that "deactivate" and related forms
are used far more often:
$ cat $(find * -type f) | grep -ci deactivat
815
$ cat $(find * -type f) | grep -ci inactivat
65
Is there some significance to the use of "inactivate" as opposed
to "deactivate"? If not, it'd be simpler and cleaner for
Emacs to use the more-typical form uniformly.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-27 23:38 bug#10150: deactive->inactive, inactivate->deactivate spelling fixes Paul Eggert
2011-11-28 11:17 ` Štěpán Němec
2011-11-28 20:46 ` Wolfgang Jenkner
@ 2012-07-29 7:19 ` Paul Eggert
2012-08-02 0:51 ` Katsumi Yamaoka
3 siblings, 0 replies; 15+ messages in thread
From: Paul Eggert @ 2012-07-29 7:19 UTC (permalink / raw)
To: 10150-done
I installed this patch in trunk bzr 109256 and
am marking this as done.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#10150: deactive->inactive, inactivate->deactivate spelling fixes
2011-11-27 23:38 bug#10150: deactive->inactive, inactivate->deactivate spelling fixes Paul Eggert
` (2 preceding siblings ...)
2012-07-29 7:19 ` Paul Eggert
@ 2012-08-02 0:51 ` Katsumi Yamaoka
2012-08-02 1:36 ` Paul Eggert
3 siblings, 1 reply; 15+ messages in thread
From: Katsumi Yamaoka @ 2012-08-02 0:51 UTC (permalink / raw)
To: Paul Eggert; +Cc: 10150
Paul Eggert wrote:
> I installed this patch in trunk bzr 109256 and
> am marking this as done.
Isn't it better to have an alias to
`inactivate-current-input-method-function' as well,
like `input-method-inactivate-hook' does?
Actually I needed to modify the Japanese input method sj3-egg,
that I maintain.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-08-02 1:36 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-27 23:38 bug#10150: deactive->inactive, inactivate->deactivate spelling fixes Paul Eggert
2011-11-28 11:17 ` Štěpán Němec
2011-11-29 8:04 ` Paul Eggert
2011-11-29 11:47 ` Štěpán Němec
[not found] ` <878vmzf8wb.fsf@gmail.com>
2011-12-31 6:12 ` Paul Eggert
2012-01-03 16:55 ` Štěpán Němec
2012-01-12 8:12 ` Paul Eggert
2012-01-12 16:08 ` Štěpán Němec
2011-11-28 20:46 ` Wolfgang Jenkner
2011-11-29 4:52 ` Chong Yidong
2011-11-29 15:37 ` Drew Adams
2011-11-29 8:33 ` Paul Eggert
2012-07-29 7:19 ` Paul Eggert
2012-08-02 0:51 ` Katsumi Yamaoka
2012-08-02 1:36 ` Paul Eggert
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).