aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emulation
diff options
context:
space:
mode:
authorEli Zaretskii2017-08-18 12:33:08 +0300
committerEli Zaretskii2017-08-18 12:33:08 +0300
commite962ca57e0bfe3bc2e319bb03dc0c6a9b1a7c5ee (patch)
treec50241e6ed684ae9cc2e3b1ab192343cd4f55a5f /lisp/emulation
parentfb1a489757eb9237afbd2e39e453e4a5e06c9d86 (diff)
downloademacs-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/emulation')
-rw-r--r--lisp/emulation/viper-init.el4
1 files changed, 1 insertions, 3 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 ()