[elpa] master 751af65 2/2: Merge commit 'f0f7a844b0c423365020113c022110d899e8c1eb' from hydra

[Oleh Krehel]

branch: master
commit 751af658547130dbe56d65fa92168a1029559185
Merge: 485abbb f0f7a84
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Merge commit 'f0f7a844b0c423365020113c022110d899e8c1eb' from hydra
---
 packages/hydra/hydra.el |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/hydra/hydra.el b/packages/hydra/hydra.el
index 86f4883..7fc9d7e 100644
--- a/packages/hydra/hydra.el
+++ b/packages/hydra/hydra.el
@@ -817,7 +817,7 @@ result of `defhydra'."
          (setq docstring "hydra")))
   (when (keywordp (car body))
     (setq body (cons nil (cons nil body))))
-  (condition-case err
+  (condition-case-unless-debug err
       (let* ((keymap (copy-keymap hydra-base-map))
              (keymap-name (intern (format "%S/keymap" name)))
              (body-name (intern (format "%S/body" name)))
@@ -951,9 +951,7 @@ result of `defhydra'."
                (or body-body-pre body-pre) body-before-exit
                '(setq prefix-arg current-prefix-arg)))))
     (error
-     (if debug-on-error
-         (signal (car err) (cdr err))
-       (message "Error in defhydra %S: %s" name (cdr err)))
+     (message "Error in defhydra %S: %s" name (cdr err))
      nil)))
 
 (defmacro defhydradio (name _body &rest heads)