remove with-ivy-window

This commit is contained in:
Eric Danan 2016-09-13 22:19:07 +02:00
parent 351ce9ec61
commit 9abc3463b9

View file

@ -51,11 +51,8 @@ With a prefix ARG invalidates the cache first."
(projectile-maybe-invalidate-cache arg) (projectile-maybe-invalidate-cache arg)
(ivy-read (projectile-prepend-project-name "Find file: ") (ivy-read (projectile-prepend-project-name "Find file: ")
(projectile-current-project-files) (projectile-current-project-files)
:action :action (lambda (x)
(lambda (x) (find-file (projectile-expand-root x)))
(with-ivy-window
(find-file
(projectile-expand-root x))))
:require-match t :require-match t
:caller 'counsel-projectile-find-file) :caller 'counsel-projectile-find-file)
(run-hooks 'projectile-find-file-hook)) (run-hooks 'projectile-find-file-hook))
@ -63,9 +60,7 @@ With a prefix ARG invalidates the cache first."
(ivy-set-actions (ivy-set-actions
'counsel-projectile-find-file 'counsel-projectile-find-file
'(("j" (lambda (x) '(("j" (lambda (x)
(with-ivy-window (find-file-other-window (projectile-expand-root x)))
(find-file-other-window
(projectile-expand-root x))))
"other window"))) "other window")))
;;; counsel-projectile-find-dir ;;; counsel-projectile-find-dir
@ -81,11 +76,8 @@ With a prefix ARG invalidates the cache first."
(if projectile-find-dir-includes-top-level (if projectile-find-dir-includes-top-level
(append '("./") (projectile-current-project-dirs)) (append '("./") (projectile-current-project-dirs))
(projectile-current-project-dirs)) (projectile-current-project-dirs))
:action :action (lambda (x)
(lambda (x) (dired (projectile-expand-root x)))
(with-ivy-window
(dired
(projectile-expand-root x))))
:require-match t :require-match t
:caller 'counsel-projectile-find-dir) :caller 'counsel-projectile-find-dir)
(run-hooks 'projectile-find-dir-hook)) (run-hooks 'projectile-find-dir-hook))
@ -93,9 +85,7 @@ With a prefix ARG invalidates the cache first."
(ivy-set-actions (ivy-set-actions
'counsel-projectile-find-dir 'counsel-projectile-find-dir
'(("j" (lambda (x) '(("j" (lambda (x)
(with-ivy-window (dired-other-window (projectile-expand-root x)))
(dired-other-window
(projectile-expand-root x))))
"other window"))) "other window")))
;;; counsel-projectile-switch-to-buffer ;;; counsel-projectile-switch-to-buffer
@ -107,18 +97,15 @@ With a prefix ARG invalidates the cache first."
(ivy-read (projectile-prepend-project-name "Switch-to-buffer: ") (ivy-read (projectile-prepend-project-name "Switch-to-buffer: ")
(-remove-item (buffer-name (current-buffer)) (-remove-item (buffer-name (current-buffer))
(projectile-project-buffer-names)) (projectile-project-buffer-names))
:action :action (lambda (x)
(lambda (x) (switch-to-buffer x))
(with-ivy-window
(switch-to-buffer x)))
:require-match t :require-match t
:caller 'counsel-projectile-switch-to-buffer)) :caller 'counsel-projectile-switch-to-buffer))
(ivy-set-actions (ivy-set-actions
'counsel-projectile-switch-to-buffer 'counsel-projectile-switch-to-buffer
'(("j" (lambda (x) '(("j" (lambda (x)
(with-ivy-window (switch-to-buffer-other-window x))
(switch-to-buffer-other-window x)))
"other window"))) "other window")))
;;; counsel-projectile ;;; counsel-projectile
@ -134,9 +121,8 @@ With a prefix ARG invalidates the cache first."
(cons (abbreviate-file-name (projectile-project-root)) (cons (abbreviate-file-name (projectile-project-root))
(projectile-relevant-known-projects)) (projectile-relevant-known-projects))
projectile-known-projects) projectile-known-projects)
:action :action (lambda (dir)
(lambda (dir) (projectile-switch-project-by-name dir arg))
(projectile-switch-project-by-name dir arg))
:require-match t :require-match t
:caller 'counsel-projectile)) :caller 'counsel-projectile))