[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 39eed63 20/22: hydra.el (hydra-disable): Deactivate key-ch
From: |
Oleh Krehel |
Subject: |
[elpa] master 39eed63 20/22: hydra.el (hydra-disable): Deactivate key-chord advice more |
Date: |
Fri, 16 Oct 2015 10:07:00 +0000 |
branch: master
commit 39eed63d6c050319a140e24621061199f8126ef5
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra-disable): Deactivate key-chord advice more
* hydra.el (hydra-disable): Deactivate key-chord advice even if
`overriding-terminal-local-map' is nil. This situation can happen with
`multiple-cursors', since it calls `hydra-disable' multiple times, and
`hydra-default-pre' is called multiple times as well.
Fixes #163
---
hydra.el | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hydra.el b/hydra.el
index 3d42c38..a7c36bb 100644
--- a/hydra.el
+++ b/hydra.el
@@ -141,16 +141,16 @@ 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)))
(dolist (frame (frame-list))
(with-selected-frame frame
(when overriding-terminal-local-map
(internal-pop-keymap hydra-curr-map 'overriding-terminal-local-map)
(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)))
(when hydra-curr-on-exit
(let ((on-exit hydra-curr-on-exit))
(setq hydra-curr-on-exit nil)
- [elpa] master 900ca34 04/22: Allow access to the current hydra body, (continued)
- [elpa] master 900ca34 04/22: Allow access to the current hydra body, Oleh Krehel, 2015/10/16
- [elpa] master 1e9276a 12/22: Remove trailing whitespace from :columns docstring, Oleh Krehel, 2015/10/16
- [elpa] master 852ae26 14/22: Use quote instead of function to prevent compiler warnings, Oleh Krehel, 2015/10/16
- [elpa] master ea36afc 19/22: Allow "_", "!", and "&" as keys in docstrings, Oleh Krehel, 2015/10/16
- [elpa] master f58d356 17/22: Allow #'command syntax for heads, just to have it, Oleh Krehel, 2015/10/16
- [elpa] master 27b7f40 15/22: Make find-function work with defhydra, Oleh Krehel, 2015/10/16
- [elpa] master 3fb3168 18/22: hydra.el (hydra--format): Allow "@" key in the docs, Oleh Krehel, 2015/10/16
- [elpa] master 336602f 11/22: Add :columns option for hydra body, Oleh Krehel, 2015/10/16
- [elpa] master 4bf7f1c 21/22: Bump version, Oleh Krehel, 2015/10/16
- [elpa] master c5327e1 16/22: Declare dired-mark to silence byte-compiler, Oleh Krehel, 2015/10/16
- [elpa] master 39eed63 20/22: hydra.el (hydra-disable): Deactivate key-chord advice more,
Oleh Krehel <=
- [elpa] master bfeccce 22/22: Merge commit '4bf7f1c9e46fb819c673e55d8a1891774e139f98' from hydra, Oleh Krehel, 2015/10/16