Bind [switch-frame] to `hydra-keyboard-quit'

* hydra.el (hydra-base-map): Update.

* hydra-test.el: Update.

Fixes #73.
master
Oleh Krehel 11 years ago
parent 3c4b3fd860
commit 9f9dcf97d8
  1. 25
      hydra-test.el
  2. 1
      hydra.el

@ -64,6 +64,7 @@ Call the head: `first-error'."
(107 . hydra-error/previous-error) (107 . hydra-error/previous-error)
(106 . hydra-error/next-error) (106 . hydra-error/next-error)
(104 . hydra-error/first-error) (104 . hydra-error/first-error)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -115,6 +116,7 @@ Call the head: `next-error'."
(107 . hydra-error/previous-error) (107 . hydra-error/previous-error)
(106 . hydra-error/next-error) (106 . hydra-error/next-error)
(104 . hydra-error/first-error) (104 . hydra-error/first-error)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -166,6 +168,7 @@ Call the head: `previous-error'."
(107 . hydra-error/previous-error) (107 . hydra-error/previous-error)
(106 . hydra-error/next-error) (106 . hydra-error/next-error)
(104 . hydra-error/first-error) (104 . hydra-error/first-error)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -223,12 +226,12 @@ The body can be accessed via `hydra-error/body'."
(setq hydra-last (setq hydra-last
(hydra-set-transient-map (hydra-set-transient-map
(setq hydra-curr-map (setq hydra-curr-map
(quote (quote (keymap (7 . hydra-keyboard-quit)
(keymap (7 . hydra-keyboard-quit)
(32 . hydra-repeat) (32 . hydra-repeat)
(107 . hydra-error/previous-error) (107 . hydra-error/previous-error)
(106 . hydra-error/next-error) (106 . hydra-error/next-error)
(104 . hydra-error/first-error) (104 . hydra-error/first-error)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -349,12 +352,12 @@ The body can be accessed via `hydra-toggle/body'."
(setq hydra-last (setq hydra-last
(hydra-set-transient-map (hydra-set-transient-map
(setq hydra-curr-map (setq hydra-curr-map
(quote (quote (keymap (7 . hydra-keyboard-quit)
(keymap (7 . hydra-keyboard-quit)
(113 . hydra-toggle/nil) (113 . hydra-toggle/nil)
(97 . hydra-toggle/abbrev-mode) (97 . hydra-toggle/abbrev-mode)
(102 . hydra-toggle/auto-fill-mode) (102 . hydra-toggle/auto-fill-mode)
(116 . hydra-toggle/toggle-truncate-lines) (116 . hydra-toggle/toggle-truncate-lines)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -410,11 +413,8 @@ Call the head: `hydra-keyboard-quit'."
(set-cursor-color "#e52b50") (set-cursor-color "#e52b50")
(hydra-disable) (hydra-disable)
(hydra-cleanup) (hydra-cleanup)
(catch (catch (quote hydra-disable)
(quote hydra-disable) (call-interactively (function hydra-keyboard-quit))
(call-interactively
(function hydra-keyboard-quit))
(set-cursor-color "#ffffff"))) (set-cursor-color "#ffffff")))
(defun hydra-vi/next-line nil "Create a hydra with no body and the heads: (defun hydra-vi/next-line nil "Create a hydra with no body and the heads:
@ -448,6 +448,7 @@ Call the head: `next-line'."
(107 . hydra-vi/previous-line) (107 . hydra-vi/previous-line)
(106 . hydra-vi/next-line) (106 . hydra-vi/next-line)
(7 . hydra-vi/hydra-keyboard-quit) (7 . hydra-vi/hydra-keyboard-quit)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -504,6 +505,7 @@ Call the head: `previous-line'."
(107 . hydra-vi/previous-line) (107 . hydra-vi/previous-line)
(106 . hydra-vi/next-line) (106 . hydra-vi/next-line)
(7 . hydra-vi/hydra-keyboard-quit) (7 . hydra-vi/hydra-keyboard-quit)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -576,6 +578,7 @@ The body can be accessed via `hydra-vi/body'."
(107 . hydra-vi/previous-line) (107 . hydra-vi/previous-line)
(106 . hydra-vi/next-line) (106 . hydra-vi/next-line)
(7 . hydra-vi/hydra-keyboard-quit) (7 . hydra-vi/hydra-keyboard-quit)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -860,6 +863,7 @@ Call the head: `(text-scale-set 0)'."
(setq hydra-curr-map (setq hydra-curr-map
(quote (keymap (7 . hydra-keyboard-quit) (quote (keymap (7 . hydra-keyboard-quit)
(114 . hydra-zoom/lambda-r) (114 . hydra-zoom/lambda-r)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -920,6 +924,7 @@ The body can be accessed via `hydra-zoom/body'."
(setq hydra-curr-map (setq hydra-curr-map
(quote (keymap (7 . hydra-keyboard-quit) (quote (keymap (7 . hydra-keyboard-quit)
(114 . hydra-zoom/lambda-r) (114 . hydra-zoom/lambda-r)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -980,6 +985,7 @@ Call the head: `(text-scale-set 0)'."
(setq hydra-curr-map (setq hydra-curr-map
(quote (keymap (7 . hydra-keyboard-quit) (quote (keymap (7 . hydra-keyboard-quit)
(114 . hydra-zoom/lambda-r) (114 . hydra-zoom/lambda-r)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)
@ -1040,6 +1046,7 @@ The body can be accessed via `hydra-zoom/body'."
(setq hydra-curr-map (setq hydra-curr-map
(quote (keymap (7 . hydra-keyboard-quit) (quote (keymap (7 . hydra-keyboard-quit)
(114 . hydra-zoom/lambda-r) (114 . hydra-zoom/lambda-r)
(switch-frame . hydra-keyboard-quit)
(kp-subtract . hydra--negative-argument) (kp-subtract . hydra--negative-argument)
(kp-9 . hydra--digit-argument) (kp-9 . hydra--digit-argument)
(kp-8 . hydra--digit-argument) (kp-8 . hydra--digit-argument)

@ -188,6 +188,7 @@ Vanquishable only through a blue head.")
(define-key map [kp-8] 'hydra--digit-argument) (define-key map [kp-8] 'hydra--digit-argument)
(define-key map [kp-9] 'hydra--digit-argument) (define-key map [kp-9] 'hydra--digit-argument)
(define-key map [kp-subtract] 'hydra--negative-argument) (define-key map [kp-subtract] 'hydra--negative-argument)
(define-key map [switch-frame] 'hydra-keyboard-quit)
map) map)
"Keymap that all Hydras inherit. See `universal-argument-map'.") "Keymap that all Hydras inherit. See `universal-argument-map'.")

Loading…
Cancel
Save