emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master eed8f6f 15/36: avy.el (avy--regex-candidates): Add optiona


From: Oleh Krehel
Subject: [elpa] master eed8f6f 15/36: avy.el (avy--regex-candidates): Add optional group arg
Date: Tue, 19 May 2015 12:38:12 +0000

branch: master
commit eed8f6fa8b52b1e6d194de8cb1bb44fedfea08e0
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    avy.el (avy--regex-candidates): Add optional group arg
---
 avy.el |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/avy.el b/avy.el
index 8fa80f6..c3099eb 100644
--- a/avy.el
+++ b/avy.el
@@ -313,10 +313,12 @@ Use OVERLAY-FN to visualize the decision overlay."
   (setq avy--overlays-back nil)
   (avy--remove-leading-chars))
 
-(defun avy--regex-candidates (regex &optional beg end pred)
+(defun avy--regex-candidates (regex &optional beg end pred group)
   "Return all elements that match REGEX.
 Each element of the list is ((BEG . END) . WND)
-When PRED is non-nil, it's a filter for matching point positions."
+When PRED is non-nil, it's a filter for matching point positions.
+When GROUP is non-nil, (BEG . END) should delimit that regex group."
+  (setq group (or group 0))
   (let ((case-fold-search avy-case-fold-search)
         candidates)
     (avy-dowindows nil
@@ -327,8 +329,8 @@ When PRED is non-nil, it's a filter for matching point 
positions."
             (unless (get-char-property (point) 'invisible)
               (when (or (null pred)
                         (funcall pred))
-                (push (cons (cons (match-beginning 0)
-                                  (match-end 0))
+                (push (cons (cons (match-beginning group)
+                                  (match-end group))
                             wnd) candidates)))))))
     (nreverse candidates)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]