[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 7f022f7 1/7: Fix unbind of key-chord when hydra is active
From: |
Oleh Krehel |
Subject: |
[elpa] master 7f022f7 1/7: Fix unbind of key-chord when hydra is active |
Date: |
Fri, 04 Mar 2016 19:59:49 +0000 |
branch: master
commit 7f022f7f1a7833618c1bf4d38a4854d2bae06199
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix unbind of key-chord when hydra is active
* hydra.el (hydra-disable): Don't remove advice on
`input-method-function' unless `hydra--ignore' is nil.
Fixes #97
---
hydra.el | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hydra.el b/hydra.el
index a7a71ac..898e209 100644
--- a/hydra.el
+++ b/hydra.el
@@ -141,11 +141,12 @@ warn: keep KEYMAP and issue a warning instead of running
the command."
"Disable the current Hydra."
(setq hydra-deactivate nil)
(remove-hook 'pre-command-hook 'hydra--clearfun)
- (if (fboundp 'remove-function)
- (remove-function input-method-function #'hydra--imf)
- (when hydra--input-method-function
- (setq input-method-function hydra--input-method-function)
- (setq hydra--input-method-function nil)))
+ (unless hydra--ignore
+ (if (fboundp 'remove-function)
+ (remove-function input-method-function #'hydra--imf)
+ (when hydra--input-method-function
+ (setq input-method-function hydra--input-method-function)
+ (setq hydra--input-method-function nil))))
(dolist (frame (frame-list))
(with-selected-frame frame
(when overriding-terminal-local-map
- [elpa] master updated (5cf5b85 -> ab7d7f3), Oleh Krehel, 2016/03/04
- [elpa] master 97cf997 4/7: Use set+make-local-variable instead of setq-local for older versions(<24.3), Oleh Krehel, 2016/03/04
- [elpa] master e0454a1 6/7: Add .elpaignore, Oleh Krehel, 2016/03/04
- [elpa] master 7f022f7 1/7: Fix unbind of key-chord when hydra is active,
Oleh Krehel <=
- [elpa] master 47fb132 3/7: hydra-examples.el (hydra-rectangle): Use better commands, Oleh Krehel, 2016/03/04
- [elpa] master 04cd3e4 5/7: hydra-examples.el (rect): Add require, Oleh Krehel, 2016/03/04
- [elpa] master ab7d7f3 7/7: Merge commit 'e0454a100541ce3f1f732b97894a3441cef3316f' from hydra, Oleh Krehel, 2016/03/04
- [elpa] master ba61006 2/7: Allow e.g. "_M-\\^_" in docstrings, Oleh Krehel, 2016/03/04