branch: master commit 6e9ab3de3d336a8ddc80c74941b86e5ddc791dc5 Author: Oleh Krehel <ohwoeo...@gmail.com> Commit: Oleh Krehel <ohwoeo...@gmail.com>
swiper.el: Add support for evil-jumper/backward * swiper.el (evil-jumper--set-jump): Declare. (swiper--init): When `evil-jumper-mode' is on, call `evil-jumper--set-jump'. * ivy.el (counsel-git-grep-cmd): Declare to silence the byte compiler. Fixes #268 --- ivy.el | 2 ++ swiper.el | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ivy.el b/ivy.el index eecff00..7561822 100644 --- a/ivy.el +++ b/ivy.el @@ -2167,6 +2167,8 @@ buffer would modify `ivy-last'.") \\{ivy-occur-grep-mode-map}") +(defvar counsel-git-grep-cmd) + (defun ivy-occur () "Stop completion and put the current matches into a new buffer. diff --git a/swiper.el b/swiper.el index e6145c0..7d2741a 100644 --- a/swiper.el +++ b/swiper.el @@ -295,11 +295,15 @@ When non-nil, INITIAL-INPUT is the initial search pattern." (defvar swiper--len 0 "The last length of input for which an anchoring was made.") +(declare-function evil-jumper--set-jump "ext:evil-jumper") + (defun swiper--init () "Perform initialization common to both completion methods." (setq swiper--opoint (point)) (setq swiper--len 0) - (setq swiper--anchor (line-number-at-pos))) + (setq swiper--anchor (line-number-at-pos)) + (when (bound-and-true-p evil-jumper-mode) + (evil-jumper--set-jump))) (defun swiper--re-builder (str) "Transform STR into a swiper regex.