Merge commit '97c2270f7138530de21f773f094c1495498cac78' from hydra

diff --combined packages/hydra/hydra-ox.el
index 1dc70885097c39fffaffafe599f65ab7c0b0a8ae,0d489e5f75bd787c673157a7ada6a68def46e69d..e8d48e34a5827764afe8791bae9016b027ba7198
--- 1/packages/hydra/hydra-ox.el
--- 2/hydra-ox.el
+++ b/packages/hydra/hydra-ox.el
@@@ -24,8 -24,9 +24,10 @@@
  ;; This shows how a complex dispatch menu can be built with Hydra.
  
  ;;; Code:
+ 
+ (require 'hydra)
  (require 'org)
 +(require 'hydra)                        ;`defhydradio' is not autoloaded!
  
  (defhydradio hydra-ox ()
    (body-only "Export only the body.")

diff --combined packages/hydra/hydra-test.el
index 3fcd403b4edf920bccb7f233f1297ec81ef3b9ca,a40a0caeadd74c7ea3f6c40c325c959f62375f4c..a40a0caeadd74c7ea3f6c40c325c959f62375f4c
--- 1/packages/hydra/hydra-test.el
--- 2/hydra-test.el
+++ b/packages/hydra/hydra-test.el
@@@ -1310,7 -1310,7 +1310,7 @@@ _w_ Worf:                      % -8`hyd
                (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 --combined packages/hydra/hydra.el
index 16d44b0e18e3feb34eef320ffc8e8716e99bc114,a7a71acc737ddff39fce2a34b0a2f338cb8ecc34..a7a71acc737ddff39fce2a34b0a2f338cb8ecc34
--- 1/packages/hydra/hydra.el
--- 2/hydra.el
+++ b/packages/hydra/hydra.el
@@@ -5,7 -5,7 +5,7 @@@
  ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
  ;; Maintainer: Oleh Krehel <ohwoeowho@gmail.com>
  ;; 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 +149,12 @@@ warn: keep KEYMAP and issue a warning i
    (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)