From 12b30b691ee64602d270c29ebea353fd06bddddf Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 6 Dec 2015 22:58:32 -0500 Subject: [PATCH] Clean up --- core/core-workgroups.el | 3 +-- core/lib/defuns-buffers.el | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core-workgroups.el b/core/core-workgroups.el index 172448b59..4e4ec14d2 100644 --- a/core/core-workgroups.el +++ b/core/core-workgroups.el @@ -36,8 +36,7 @@ (setq projectile-switch-project-action 'narf/wg-projectile-switch-project)) ;; Don't remember popwin windows - (add-hook! kill-emacs 'popwin:close-popup-window) - (add-hook! wg-before-switch-to-workgroup 'popwin:close-popup-window) + (add-hook! (kill-emacs wg-before-switch-to-workgroup) 'popwin:close-popup-window) ;; Initialize! (add-hook! after-init diff --git a/core/lib/defuns-buffers.el b/core/lib/defuns-buffers.el index 96714c54b..bd7f219b7 100644 --- a/core/lib/defuns-buffers.el +++ b/core/lib/defuns-buffers.el @@ -51,7 +51,9 @@ Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" (defun narf/get-all-buffers () "Get all buffers across all workgroups. Depends on `wg-mess-with-buffer-list'." - (wg-buffer-list-emacs)) + (if (and (featurep 'workgroups2) workgroups-mode) + (wg-buffer-list-emacs) + (buffer-list))) ;;;###autoload (defun narf/get-buffers ()