update popups

1 files changed, 15 insertions, 18 deletions

diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index 43d42d4..3788b9d 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -821,11 +821,6 @@
 (setq window-sides-slots '(0 0 2 2))  ; 2 right side windows
 (setq switch-to-buffer-obey-display-actions t)
 (setq switch-to-buffer-in-dedicated-window 'pop)
-;; Prevent pop-up buffers from using new windows.
-;; (add-to-list 'display-buffer-alist
-;; 	     '("\\*Help" (display-buffer-same-window)))
-;; (add-to-list 'display-buffer-alist
-;; 	     '("\\*info" (display-buffer-same-window)))
 
 (defvar kj/popup-override nil)
 
@@ -847,19 +842,21 @@
 
 (defun kj/popup-buffer-base (buffer &optional condition)
   (or
-   (s-matches-p (rx (| "*Help*"
-                       "*info*"
-                       (seq "*scratch*")
-                       (seq "*Messages*")
-                       (seq "*Backtrace*")
-                       (seq "*eldoc " (* anything) "*")
-                       (seq "*WoMan " (* anything) "*")
-                       (seq "*man " (* anything) "*")
-                       (seq "fig: " (* anything))
-                       (seq "*htop*" (* anything))
-                       (seq "*Proced*" (* anything))
-                       (seq "*eshell*" (* anything))
-                       "*Occur*")) buffer)
+   (s-matches-p
+    (rx (| "*Help*"
+           "*info*"
+           (seq "*scratch*")
+           (seq "*Messages*")
+           (seq "*Warnings*")
+           (seq "*Backtrace*")
+           (seq "*eldoc " (* anything) "*")
+           (seq "*WoMan " (* anything) "*")
+           (seq "*man " (* anything) "*")
+           (seq "fig: " (* anything))
+           (seq "*htop*" (* anything))
+           (seq "*Proced*" (* anything))
+           (seq "*eshell*" (* anything))
+           "*Occur*")) buffer)
    (with-current-buffer buffer
      (apply #'derived-mode-p
             '(magit-mode