summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/init.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 71a64754..e724cfc4 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -562,6 +562,14 @@ Values: `desktop', `server', `laptop'")
               (ido-initiate-auto-merge (current-buffer)))
             (bind-key "C-c C-s" #'ido-manual-merge ido-file-dir-completion-map)))
 
+(defun ap/ido-projectile-switch-buffer-dwim (force-ido)
+  (interactive "p")
+  (if (and (projectile-project-p) (eq force-ido 1))
+      (call-interactively #'projectile-switch-to-buffer)
+    (call-interactively #'ido-switch-buffer)))
+
+(bind-key "C-c b" #'ap/ido-projectile-switch-buffer-dwim)
+
 (use-package ido-vertical-mode
   :config (ido-vertical-mode 1))
 
@@ -635,8 +643,7 @@ Values: `desktop', `server', `laptop'")
   :bind (("C-c C-a" . org-agenda-list)
          ("C-c a" . org-agenda)
          ("C-c l" . org-store-link)
-         ("C-c r" . org-remember)
-         ("C-c b" . org-iswitchb))
+         ("C-c r" . org-remember))
   :config (progn
             (setq org-directory "~/org"
                   org-agenda-files `(,org-directory)