diff options
| author | Eli Zaretskii | 2017-08-18 12:33:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-08-18 12:33:08 +0300 |
| commit | e962ca57e0bfe3bc2e319bb03dc0c6a9b1a7c5ee (patch) | |
| tree | c50241e6ed684ae9cc2e3b1ab192343cd4f55a5f /lisp | |
| parent | fb1a489757eb9237afbd2e39e453e4a5e06c9d86 (diff) | |
| download | emacs-e962ca57e0bfe3bc2e319bb03dc0c6a9b1a7c5ee.tar.gz emacs-e962ca57e0bfe3bc2e319bb03dc0c6a9b1a7c5ee.zip | |
Don't call the same hook twice due to obsolete aliases
* lisp/international/robin.el (robin-activate):
* lisp/international/quail.el (quail-activate):
* lisp/international/mule-cmds.el (deactivate-input-method):
* lisp/emulation/viper-init.el (viper-deactivate-input-method):
Don't call the same hook twice, when the obsolete and the
advertised symbols are aliased. (Bug#28118)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emulation/viper-init.el | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 | ||||
| -rw-r--r-- | lisp/international/quail.el | 4 | ||||
| -rw-r--r-- | lisp/international/robin.el | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 0d478011238..a67dd4d762f 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el | |||
| @@ -344,9 +344,7 @@ Use `\\[viper-set-expert-level]' to change this.") | |||
| 344 | (quail-delete-overlays)) | 344 | (quail-delete-overlays)) |
| 345 | (setq describe-current-input-method-function nil) | 345 | (setq describe-current-input-method-function nil) |
| 346 | (setq current-input-method nil) | 346 | (setq current-input-method nil) |
| 347 | (run-hooks | 347 | (run-hooks 'input-method-deactivate-hook) |
| 348 | 'input-method-inactivate-hook ; for backward compatibility | ||
| 349 | 'input-method-deactivate-hook) | ||
| 350 | (force-mode-line-update)) | 348 | (force-mode-line-update)) |
| 351 | )) | 349 | )) |
| 352 | (defun viper-activate-input-method () | 350 | (defun viper-activate-input-method () |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index bcbc92844d6..ee31dea69ec 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -1482,9 +1482,7 @@ If INPUT-METHOD is nil, deactivate any current input method." | |||
| 1482 | current-input-method-title nil) | 1482 | current-input-method-title nil) |
| 1483 | (funcall deactivate-current-input-method-function)) | 1483 | (funcall deactivate-current-input-method-function)) |
| 1484 | (unwind-protect | 1484 | (unwind-protect |
| 1485 | (run-hooks | 1485 | (run-hooks 'input-method-deactivate-hook) |
| 1486 | 'input-method-inactivate-hook ; for backward compatibility | ||
| 1487 | 'input-method-deactivate-hook) | ||
| 1488 | (setq current-input-method nil) | 1486 | (setq current-input-method nil) |
| 1489 | (force-mode-line-update))))) | 1487 | (force-mode-line-update))))) |
| 1490 | 1488 | ||
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 036b80eb028..b7f0b156394 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el | |||
| @@ -569,9 +569,7 @@ While this input method is active, the variable | |||
| 569 | (setq describe-current-input-method-function nil) | 569 | (setq describe-current-input-method-function nil) |
| 570 | (quail-hide-guidance) | 570 | (quail-hide-guidance) |
| 571 | (remove-hook 'post-command-hook 'quail-show-guidance t) | 571 | (remove-hook 'post-command-hook 'quail-show-guidance t) |
| 572 | (run-hooks | 572 | (run-hooks 'quail-deactivate-hook)) |
| 573 | 'quail-inactivate-hook ; for backward compatibility | ||
| 574 | 'quail-deactivate-hook)) | ||
| 575 | (kill-local-variable 'input-method-function)) | 573 | (kill-local-variable 'input-method-function)) |
| 576 | ;; Let's activate Quail input method. | 574 | ;; Let's activate Quail input method. |
| 577 | (if (null quail-current-package) | 575 | (if (null quail-current-package) |
diff --git a/lisp/international/robin.el b/lisp/international/robin.el index 0ef90b18932..077809b6c1f 100644 --- a/lisp/international/robin.el +++ b/lisp/international/robin.el | |||
| @@ -413,9 +413,7 @@ While this input method is active, the variable | |||
| 413 | (progn | 413 | (progn |
| 414 | (setq robin-mode nil) | 414 | (setq robin-mode nil) |
| 415 | (setq describe-current-input-method-function nil) | 415 | (setq describe-current-input-method-function nil) |
| 416 | (run-hooks | 416 | (run-hooks 'robin-deactivate-hook)) |
| 417 | 'robin-inactivate-hook ; for backward compatibility | ||
| 418 | 'robin-deactivate-hook)) | ||
| 419 | (kill-local-variable 'input-method-function)) | 417 | (kill-local-variable 'input-method-function)) |
| 420 | 418 | ||
| 421 | ;; activate robin input method. | 419 | ;; activate robin input method. |