branch: master
commit 09b63b5b3407ab34210e81eca4fba7378f1e9f4e
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
Don't re-activate key chords too early
* hydra.el (hydra-disable): Re-activate key chords only if
`hydra--ignore' is nil.
(hydra-keyboard-quit): Update.
Re #97
---
hydra.el | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hydra.el b/hydra.el
index 50eb901..1c19b79 100644
--- a/hydra.el
+++ b/hydra.el
@@ -131,10 +131,13 @@ warn: keep KEYMAP and issue a warning instead of running
the command."
(when overriding-terminal-local-map
(internal-pop-keymap hydra-curr-map 'overriding-terminal-local-map)
(unless hydra--ignore
- (when hydra-curr-on-exit
- (let ((on-exit hydra-curr-on-exit))
- (setq hydra-curr-on-exit nil)
- (funcall on-exit))))))))
+ (when hydra--input-method-function
+ (setq input-method-function hydra--input-method-function)
+ (setq hydra--input-method-function nil))
+ (when hydra-curr-on-exit
+ (let ((on-exit hydra-curr-on-exit))
+ (setq hydra-curr-on-exit nil)
+ (funcall on-exit))))))))
(unless (fboundp 'internal-push-keymap)
(defun internal-push-keymap (keymap symbol)
@@ -371,9 +374,6 @@ Return DEFAULT if PROP is not in H."
(hydra-disable)
(cancel-timer hydra-timeout-timer)
(cancel-timer hydra-message-timer)
- (when hydra--input-method-function
- (setq input-method-function hydra--input-method-function)
- (setq hydra--input-method-function nil))
(if hydra-lv
(when (window-live-p lv-wnd)
(let ((buf (window-buffer lv-wnd)))
