[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a0561bf 9/9: Merge commit '97c2270f7138530de21f773f094c149
From: |
Oleh Krehel |
Subject: |
[elpa] master a0561bf 9/9: Merge commit '97c2270f7138530de21f773f094c1495498cac78' from hydra |
Date: |
Tue, 08 Dec 2015 09:26:23 +0000 |
branch: master
commit a0561bff0dfcf267ee1796924f5aad904c377ee9
Merge: 9b83857 97c2270
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Merge commit '97c2270f7138530de21f773f094c1495498cac78' from hydra
---
packages/hydra/hydra-ox.el | 2 ++
packages/hydra/hydra-test.el | 2 +-
packages/hydra/hydra.el | 14 +++++++-------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/packages/hydra/hydra-ox.el b/packages/hydra/hydra-ox.el
index 1dc7088..e8d48e3 100644
--- a/packages/hydra/hydra-ox.el
+++ b/packages/hydra/hydra-ox.el
@@ -24,6 +24,8 @@
;; This shows how a complex dispatch menu can be built with Hydra.
;;; Code:
+
+(require 'hydra)
(require 'org)
(require 'hydra) ;`defhydradio' is not autoloaded!
diff --git a/packages/hydra/hydra-test.el b/packages/hydra/hydra-test.el
index 3fcd403..a40a0ca 100644
--- a/packages/hydra/hydra-test.el
+++ b/packages/hydra/hydra-test.el
@@ -1310,7 +1310,7 @@ _w_ Worf: % -8`hydra-tng/worf^^
_h_ Set phasers to
(goto-char (point-max))
(search-backward "|")
(delete-char 1)
- (setq current-prefix-arg)
+ (setq current-prefix-arg nil)
,@body
(insert "|")
(when (region-active-p)
diff --git a/packages/hydra/hydra.el b/packages/hydra/hydra.el
index 16d44b0..a7a71ac 100644
--- a/packages/hydra/hydra.el
+++ b/packages/hydra/hydra.el
@@ -5,7 +5,7 @@
;; Author: Oleh Krehel <address@hidden>
;; Maintainer: Oleh Krehel <address@hidden>
;; URL: https://github.com/abo-abo/hydra
-;; Version: 0.13.3
+;; Version: 0.13.4
;; Keywords: bindings
;; Package-Requires: ((cl-lib "0.5"))
@@ -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, 2015/12/08
- [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 <=
- [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