diff options
| author | wouter bolsterlee <wouter@bolsterl.ee> | 2017-12-24 14:13:52 +0100 |
|---|---|---|
| committer | wouter bolsterlee <wouter@bolsterl.ee> | 2017-12-24 14:13:52 +0100 |
| commit | 8ce8b63c679d4da1085238c5df006bb7fbff04f1 (patch) | |
| tree | 7b79557f06f59e5ce37a9d0aaba8373d8e6174fa /evil-integration.el | |
| parent | 16ab2539dc3f9a3d1b1c59106cb07d16366acfc6 (diff) | |
Add missing avy commands in evil-integration
Evil's built-in integration with avy is missing some avy commands,
which causes unexpected behaviour: some avy commands do not properly
behave as evil motions.
Add the missing commands, and while at it, sort the names in
alphabetic order.
Diffstat (limited to 'evil-integration.el')
| -rw-r--r-- | evil-integration.el | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/evil-integration.el b/evil-integration.el index cf9c00e..48f01cf 100644 --- a/evil-integration.el +++ b/evil-integration.el @@ -507,36 +507,46 @@ Based on `evil-enclose-ace-jump-for-motion'." (call-interactively ',command)))))) ;; define evil-avy-* motion commands for avy-* commands -(evil-define-avy-motion avy-goto-word-or-subword-1 exclusive) -(evil-define-avy-motion avy-goto-line line) (evil-define-avy-motion avy-goto-char inclusive) (evil-define-avy-motion avy-goto-char-2 inclusive) (evil-define-avy-motion avy-goto-char-2-above inclusive) (evil-define-avy-motion avy-goto-char-2-below inclusive) (evil-define-avy-motion avy-goto-char-in-line inclusive) (evil-define-avy-motion avy-goto-char-timer inclusive) +(evil-define-avy-motion avy-goto-line line) +(evil-define-avy-motion avy-goto-line-above line) +(evil-define-avy-motion avy-goto-line-below line) +(evil-define-avy-motion avy-goto-subword-0 exclusive) +(evil-define-avy-motion avy-goto-subword-1 exclusive) +(evil-define-avy-motion avy-goto-symbol-1 exclusive) +(evil-define-avy-motion avy-goto-symbol-1-above exclusive) +(evil-define-avy-motion avy-goto-symbol-1-below exclusive) (evil-define-avy-motion avy-goto-word-0 exclusive) (evil-define-avy-motion avy-goto-word-1 exclusive) (evil-define-avy-motion avy-goto-word-1-above exclusive) (evil-define-avy-motion avy-goto-word-1-below exclusive) -(evil-define-avy-motion avy-goto-subword-0 exclusive) -(evil-define-avy-motion avy-goto-subword-1 exclusive) +(evil-define-avy-motion avy-goto-word-or-subword-1 exclusive) ;; remap avy-* commands to evil-avy-* commands -(dolist (command '(avy-goto-word-or-subword-1 - avy-goto-line - avy-goto-char +(dolist (command '(avy-goto-char avy-goto-char-2 avy-goto-char-2-above avy-goto-char-2-below avy-goto-char-in-line avy-goto-char-timer + avy-goto-line + avy-goto-line-above + avy-goto-line-below + avy-goto-subword-0 + avy-goto-subword-1 + avy-goto-symbol-1 + avy-goto-symbol-1-above + avy-goto-symbol-1-below avy-goto-word-0 avy-goto-word-1 avy-goto-word-1-above avy-goto-word-1-below - avy-goto-subword-0 - avy-goto-subword-1)) + avy-goto-word-or-subword-1)) (define-key evil-motion-state-map (vector 'remap command) (intern-soft (format "evil-%s" command)))) |