From f8a634b3f91a255fad0cbddd5b55fc7789455a5e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 24 Feb 2017 03:08:48 -0500 Subject: [PATCH] core/autoload/buffers: remove workgroups2 references in doom-buffer-list + refactor --- core/autoload/buffers.el | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el index 493e090f0..702ec3311 100644 --- a/core/autoload/buffers.el +++ b/core/autoload/buffers.el @@ -61,21 +61,15 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" If PROJECT-P is non-nil, get all buffers associated with the current project in the current workspace." - (let* ((buffers (cond ((and (featurep 'workgroups2) workgroups-mode) - (wg-workgroup-associated-buffers nil)) - ((and (featurep 'persp-mode) persp-mode) - (persp-buffer-list-restricted)) - (t (buffer-list)))) - (project-root (and project-p (doom-project-root t))) - (buffer-list (if project-root - (funcall (if (eq project-p 'not) 'cl-remove-if 'cl-remove-if-not) - (lambda (b) (projectile-project-buffer-p b project-root)) - buffers) - buffers)) - (fallback-buffer (doom-fallback-buffer))) - (unless (memq fallback-buffer buffer-list) - (nconc buffer-list (list (doom-fallback-buffer)))) - buffer-list)) + (let ((buffers (if (and (featurep 'persp-mode) persp-mode) + (persp-buffer-list-restricted) + (buffer-list))) + (project-root (and project-p (doom-project-root t)))) + (if project-root + (funcall (if (eq project-p 'not) 'cl-remove-if 'cl-remove-if-not) + (lambda (b) (projectile-project-buffer-p b project-root)) + buffers) + buffers))) ;;;###autoload (defun doom-real-buffers-list (&optional buffer-list)