From 3830a8aba1ba1fb9804700d7aafe7e19d0bacca0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 3 Feb 2018 18:06:44 -0500 Subject: [PATCH] feature/workspaces: fix infinite recursion in buffer-predicate #399 By refactoring so that the middle-man buffer predicate wasn't necessary. --- core/core-ui.el | 2 +- modules/feature/workspaces/config.el | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index c1c297518..66b437fbe 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -491,7 +491,7 @@ character that looks like a space that `whitespace-mode' won't affect.") ;; simple name in frame title (setq frame-title-format '("%b – Doom Emacs")) ;; make `next-buffer', `other-buffer', etc. ignore unreal buffers -(push '(buffer-predicate . doom-buffer-frame-predicate) default-frame-alist) +(map-put default-frame-alist 'buffer-predicate #'doom-buffer-frame-predicate) ;; draw me like one of your French editors (tooltip-mode -1) ; relegate tooltips to echo area only (menu-bar-mode -1) diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el index f804b6fe5..a52246a13 100644 --- a/modules/feature/workspaces/config.el +++ b/modules/feature/workspaces/config.el @@ -29,14 +29,9 @@ stored in `persp-save-dir'.") (def-package! persp-mode :defer t :init - (defun +workspaces-buffer-predicate (buf) - (funcall (if persp-mode - (frame-parameter nil 'persp-buffer-predicate-generated) - #'doom-buffer-frame-predicate) - buf)) - (defun +workspaces|init () - (map-put default-frame-alist 'buffer-predicate #'+workspaces-buffer-predicate) + ;; Remove default buffer predicate so persp-mode can put in its own + (setq default-frame-alist (map-delete default-frame-alist 'buffer-predicate)) (add-hook 'after-make-frame-functions #'+workspaces|init-frame) (require 'persp-mode) (unless (daemonp)