From 2e6a04e53650fd969de22cc3c1afe14b5ef624f0 Mon Sep 17 00:00:00 2001 From: "Itai Y. Efrat" Date: Thu, 1 Jul 2021 00:11:46 +0300 Subject: [PATCH] selectrum: remove embark export/collect popup rules They don't seem to be necessary anymore, and cause issues with window opening logic when clicking on links in exported grep buffers. --- modules/completion/selectrum/TODO.org | 13 ++++++++----- modules/completion/selectrum/config.el | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/completion/selectrum/TODO.org b/modules/completion/selectrum/TODO.org index f6c52ed7a..af7b4f441 100644 --- a/modules/completion/selectrum/TODO.org +++ b/modules/completion/selectrum/TODO.org @@ -80,11 +80,14 @@ working of this whole set up are a bit opaque to me. * PROJ Review blocking Issues ** TODO Embark export window buffer switching logic -If we export bookmarks, grep session, or ~find-file~ session, when pressing -enter, it opens the new buffer in another window rather than the main one, even -though at least the bookmark function ostensibly uses -~pop-to-buffer-same-window~. Ivy gets the window switched in the bookmarks and -grep case due to a custom ivy occur window switching function. +*** DONE ~grep~ +The clicking links exported grep buffers used to open in a new window, but now + open in another window. Caused by the ~set-popup-rule!~ entries for the embark + export/collect buffers. These don't seem to serve much of a purpose at this + point so they have been removed. +*** TODO Open upstream Embark issue for ~bookmark~ and ~file~ +~bookmark~ or ~file~ export buffers open the links in the same window rather than +the other one. This can be reproduces on emacs -Q. ** TODO Icons Partially solved, seems to have interaction with selectrum height issue, so not yet implemented. diff --git a/modules/completion/selectrum/config.el b/modules/completion/selectrum/config.el index 107625afe..5de489c62 100644 --- a/modules/completion/selectrum/config.el +++ b/modules/completion/selectrum/config.el @@ -133,9 +133,7 @@ "h" #'doom/help-packages "b" #'doom/bump-package "c" #'doom/help-package-config - "u" #'doom/help-package-homepage) - (set-popup-rule! "^\\*Embark Export" :size 0.35 :ttl 0 :quit nil) - (set-popup-rule! "^\\*Embark Collect" :size 0.35 :ttl 0 :quit nil)) + "u" #'doom/help-package-homepage)) (use-package! marginalia :hook (doom-first-input . marginalia-mode)