ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 21:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el (avy-action-copy): Copy line for avy-goto-line

Browse Source 
* avy.el (avy-command): New defvar.
(avy-with): Actions can now access the symbol from `avy-with' using
`avy-command'.
(avy-action-copy): Copy line for `avy-goto-line'. Copy sexp for all
other commands.

Fixes #191
This commit is contained in:
Oleh Krehel 2017-04-07 10:11:17 +02:00
parent 54bce2cfb0
commit 105efc8482
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
avy.el
View File

@ -489,6 +489,10 @@ multiple DISPLAY-FN invokations."
Commands using `avy-with' macro can be resumed." Commands using `avy-with' macro can be resumed."
(interactive)) (interactive))
(defvar avy-command nil
"Store the current command symbol.
E.g. 'avy-goto-line or 'avy-goto-char.")
(defmacro avy-with (command &rest body) (defmacro avy-with (command &rest body)
"Set `avy-keys' according to COMMAND and execute BODY. "Set `avy-keys' according to COMMAND and execute BODY.
Set `avy-style' according to COMMMAND as well." Set `avy-style' according to COMMMAND as well."
@ -497,7 +501,8 @@ Set `avy-style' according to COMMMAND as well."
`(let ((avy-keys (or (cdr (assq ',command avy-keys-alist)) `(let ((avy-keys (or (cdr (assq ',command avy-keys-alist))
avy-keys)) avy-keys))
(avy-style (or (cdr (assq ',command avy-styles-alist)) (avy-style (or (cdr (assq ',command avy-styles-alist))
avy-style))) avy-style))
(avy-command ',command))
(setq avy-action nil) (setq avy-action nil)
(setf (symbol-function 'avy-resume) (setf (symbol-function 'avy-resume)
(lambda () (lambda ()
@ -523,7 +528,9 @@ Set `avy-style' according to COMMMAND as well."
(save-excursion (save-excursion
(let (str) (let (str)
(goto-char pt) (goto-char pt)
(forward-sexp) (if (eq avy-command 'avy-goto-line)
(end-of-line)
(forward-sexp))
(setq str (buffer-substring pt (point))) (setq str (buffer-substring pt (point)))
(kill-new str) (kill-new str)
(message "Copied: %s" str))) (message "Copied: %s" str)))