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

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

[elpa] master 056614d 22/57: Rename avy-swiper to swiper-avy


From: Oleh Krehel
Subject: [elpa] master 056614d 22/57: Rename avy-swiper to swiper-avy
Date: Tue, 19 May 2015 14:21:28 +0000

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

    Rename avy-swiper to swiper-avy
    
    * swiper.el (swiper-avy): Rename and fix the regex.
---
 swiper.el |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/swiper.el b/swiper.el
index 3c58d59..130b121 100644
--- a/swiper.el
+++ b/swiper.el
@@ -79,7 +79,7 @@
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "M-q") 'swiper-query-replace)
     (define-key map (kbd "C-l") 'swiper-recenter-top-bottom)
-    (define-key map (kbd "C-'") 'avy-swiper)
+    (define-key map (kbd "C-'") 'swiper-avy)
     map)
   "Keymap for swiper.")
 
@@ -106,12 +106,13 @@
 (declare-function avy--goto "ext:avy")
 
 ;;;###autoload
-(defun avy-swiper ()
+(defun swiper-avy ()
   "Jump to one of the current swiper candidates."
   (interactive)
   (with-selected-window (ivy-state-window ivy-last)
     (let* ((candidates
-            (avy--regex-candidates ivy-text))
+            (avy--regex-candidates
+             (funcall ivy--regex-function ivy-text)))
            (avy-background nil)
            (candidate
             (avy--process candidates #'avy--overlay-post)))



reply via email to

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