[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 90a4e76 4/9: hydra.el (hydra-disable): Call the exit actio
From: |
Oleh Krehel |
Subject: |
[elpa] master 90a4e76 4/9: hydra.el (hydra-disable): Call the exit action only in one frame |
Date: |
Tue, 08 Dec 2015 09:26:22 +0000 |
branch: master
commit 90a4e76c378239940e22696f02b6843b162da2fd
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra-disable): Call the exit action only in one frame
* hydra.el (hydra-disable): Move the action calling code out
of (frame-list) loop.
The (frame-list) loop was added to fix #105 to restor the
terminal-local-map in all frames. There's no reason for action-calling
code to be in that loop.
Fixes #169.
---
hydra.el | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hydra.el b/hydra.el
index 16d44b0..d4160bf 100644
--- a/hydra.el
+++ b/hydra.el
@@ -149,12 +149,12 @@ warn: keep KEYMAP and issue a warning instead of running
the command."
(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
- (when hydra-curr-on-exit
- (let ((on-exit hydra-curr-on-exit))
- (setq hydra-curr-on-exit nil)
- (funcall on-exit))))))))
+ (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)))))
(unless (fboundp 'internal-push-keymap)
(defun internal-push-keymap (keymap symbol)
- [elpa] master updated (8574898 -> a0561bf), Oleh Krehel, 2015/12/08
- [elpa] master 98726b3 2/9: Makefile: bring back cask for undercover to load, Oleh Krehel, 2015/12/08
- [elpa] master 2f68d9c 1/9: Allow empty separator though e.g. "mm10", Oleh Krehel, 2015/12/08
- [elpa] master 90a4e76 4/9: hydra.el (hydra-disable): Call the exit action only in one frame,
Oleh Krehel <=
- [elpa] master 144892b 3/9: Makefile: use plain cask, Oleh Krehel, 2015/12/08
- [elpa] master 366689f 6/9: Fix byte-compiler warnings, Oleh Krehel, 2015/12/08
- [elpa] master 9b83857 7/9: Merge commit '366689f15373ffacfe4d28b36e6325d193a4e752' from tiny, Oleh Krehel, 2015/12/08
- [elpa] master a0561bf 9/9: Merge commit '97c2270f7138530de21f773f094c1495498cac78' from hydra, Oleh Krehel, 2015/12/08
- [elpa] master 7e5f64e 5/9: hydra-ox.el: Add a require hydra, Oleh Krehel, 2015/12/08
- [elpa] master 97c2270 8/9: Fix byte-compiler warning, Oleh Krehel, 2015/12/08