From 96058450da3528f8224bc5f7003605661548ffd5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 5 Jun 2016 23:15:01 -0400 Subject: [PATCH] Refactor ivy switch buffer defuns --- core/defuns/defuns-project.el | 9 ++------- private/my-bindings.el | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/defuns/defuns-project.el b/core/defuns/defuns-project.el index 17ccf4a61..1cc023149 100644 --- a/core/defuns/defuns-project.el +++ b/core/defuns/defuns-project.el @@ -31,22 +31,17 @@ determine if a directory is a project." ;; ;;;###autoload -(defun doom/switch-to-project-buffer (&optional all-p) +(defun doom/switch-to-project-buffer () "Displays open buffers in current project. If ALL-P, then show all open buffers." (interactive) - (ivy-read "Switch to: " (doom/get-buffer-names (not all-p)) + (ivy-read "Switch to: " (doom/get-buffer-names t) :matcher #'ivy--switch-buffer-matcher :preselect (buffer-name (other-buffer (current-buffer))) :action #'ivy--switch-buffer-action :keymap ivy-switch-buffer-map :caller 'doom/switch-to-project-buffer)) -;;;###autoload -(defun doom/switch-to-buffer () - (interactive) - (doom/switch-to-project-buffer t)) - ;;;###autoload (defun doom/find-file-in-emacsd () (interactive) diff --git a/private/my-bindings.el b/private/my-bindings.el index 0a67e927c..4d407f506 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -78,7 +78,7 @@ :m ";" 'evil-ex (:leader :nv "," 'doom/switch-to-project-buffer - :nv "<" 'doom/switch-to-buffer + :nv "<" 'ivy-switch-buffer :nv "." 'counsel-find-file :nv ">" 'projectile-find-file-in-known-projects :nv "/" 'counsel-projectile-find-file