Merge commit 'f0f7a844b0c423365020113c022110d899e8c1eb' from hydra

diff --combined packages/hydra/hydra.el
index 86f488327d2bc49cc6f19f3fa52ed9d778661a30,7fc9d7e4d6519695205d7a1fcc4a7e5b26001d6b..7fc9d7e4d6519695205d7a1fcc4a7e5b26001d6b
--- 1/packages/hydra/hydra.el
--- 2/hydra.el
+++ b/packages/hydra/hydra.el
@@@ -817,7 -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 +951,7 @@@
                 (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)