[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f9bf8fe 08/45: hydra.el (hydra-set-transient-map): Update
From: |
Oleh Krehel |
Subject: |
[elpa] master f9bf8fe 08/45: hydra.el (hydra-set-transient-map): Update |
Date: |
Thu, 16 Apr 2015 12:45:41 +0000 |
branch: master
commit f9bf8feeb0e139e13bdb9d9722201c9a3879cef7
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra-set-transient-map): Update
A quick fix for the recursion issue in Emacs 25.
I'll have to see at some point why the recursion was happening.
Fixes #101
---
hydra.el | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hydra.el b/hydra.el
index 2c06c66..da7f58e 100644
--- a/hydra.el
+++ b/hydra.el
@@ -79,12 +79,11 @@
(require 'cl-lib)
(require 'lv)
-(defalias 'hydra-set-transient-map
- (if (fboundp 'set-transient-map)
- 'set-transient-map
- (lambda (map _keep-pred &optional on-exit)
- (with-no-warnings
- (set-temporary-overlay-map map (hydra--pred on-exit))))))
+(defun hydra-set-transient-map (map _keep-pred &optional on-exit)
+ (if (fboundp 'set-transient-map)
+ (set-transient-map map (hydra--pred on-exit))
+ (with-no-warnings
+ (set-temporary-overlay-map map (hydra--pred on-exit)))))
(defun hydra--pred (on-exit)
"Generate a predicate on whether to continue the Hydra state.
- [elpa] master updated (22139ae -> f972634), Oleh Krehel, 2015/04/16
- [elpa] master cc6accd 04/45: hydra.el (hydra--digit-argument): Fix for Emacs 24.3, Oleh Krehel, 2015/04/16
- [elpa] master e4cae0a 03/45: hydra.el (defhydra): Simplify :cmd-name part, Oleh Krehel, 2015/04/16
- [elpa] master c06c006 02/45: Use set/defvar for keymap, Oleh Krehel, 2015/04/16
- [elpa] master e7aaafb 07/45: hydra.el (hydra-pink-fallback): Allow prefix arguments, Oleh Krehel, 2015/04/16
- [elpa] master d0cc1c5 01/45: Define a keymap var for each hydra and re-use it, Oleh Krehel, 2015/04/16
- [elpa] master 666048c 10/45: Update testing setup, Oleh Krehel, 2015/04/16
- [elpa] master f9bf8fe 08/45: hydra.el (hydra-set-transient-map): Update,
Oleh Krehel <=
- [elpa] master 60483cb 09/45: Add integration testing, Oleh Krehel, 2015/04/16
- [elpa] master 4dde4f7 11/45: hydra.el (hydra--format): Add some more symbols, Oleh Krehel, 2015/04/16
- [elpa] master 3fce2bd 12/45: Try to re-encode the input in the terminal, Oleh Krehel, 2015/04/16
- [elpa] master fa5643f 15/45: Quit Hydra for `handle-switch-frame', Oleh Krehel, 2015/04/16
- [elpa] master af39a98 14/45: Adapt to the new `hydra-set-transient-map', Oleh Krehel, 2015/04/16
- [elpa] master acdec5b 27/45: Add an integration test for digit args in amaranth, Oleh Krehel, 2015/04/16
- [elpa] master 1a54e09 05/45: hydra.el (hydra--make-funcall): Update location, Oleh Krehel, 2015/04/16
- [elpa] master b351b7c 24/45: hydra.el (hydra--body-color): Remove, Oleh Krehel, 2015/04/16
- [elpa] master 5787a4d 13/45: Move away from setting "t" in keymaps, Oleh Krehel, 2015/04/16
- [elpa] master 5379642 06/45: Use `hydra-keyboard-quit' instead of `hydra-cleanup', Oleh Krehel, 2015/04/16