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

diff --git a/ivy.el b/ivy.el
index eecff0054c64a4110fc4143f3e218e56251556ed..7561822159abaf4ee6486c7eff344842f156dd86 100644 (file)
--- 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 e6145c06141b47219e29306334ca741ea8c3979b..7d2741ac5f6efee54f3c362b462518abb85a2612 100644 (file)
--- 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.