From 577e8b8102e17b173f9a4e0f55752a56aae45132 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 12 Aug 2020 20:57:04 -0400 Subject: [PATCH] Excluse treemacs buffer from ace-window This allows users to jump to treemacs with ace-window, but when opening files from treemacs with treemacs-visit-node-ace-* commands (e.g. on oaa) it doesn't make sense to open files in the treemacs window. --- modules/ui/treemacs/config.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el index d660c699f..dfcc582cc 100644 --- a/modules/ui/treemacs/config.el +++ b/modules/ui/treemacs/config.el @@ -26,9 +26,14 @@ This must be set before `treemacs' has loaded.") treemacs-persist-file (concat doom-cache-dir "treemacs-persist") treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist")) :config - ;; Allow ace-window to target treemacs windows - (after! ace-window - (delq! 'treemacs-mode aw-ignored-buffers)) + ;; Allow ace-window to target treemacs windows, just not for + ;; treemacs-visit-node-ace-* commands. + (defadvice! +treemacs--ace-window-ignore-treemacs-buffer-a (orig-fn &rest args) + :around '(treemacs-visit-node-ace + treemacs-visit-node-ace-horizontal-split + treemacs-visit-node-ace-vertical-split) + (let ((aw-ignored-buffers (cons 'treemacs-mode aw-ignored-buffers))) + (apply orig-fn args))) ;; Don't follow the cursor (treemacs-follow-mode -1)