Updating Doom Emacs.

.emacs.d/modules/ui/popup/autoload/popup.el

@@ -13,26 +13,27 @@
 (defun +popup--kill-buffer (buffer ttl)
   "Tries to kill BUFFER, as was requested by a transient timer. If it fails, eg.
 the buffer is visible, then set another timer and try again later."
-  (when (buffer-live-p buffer)
-    (let ((inhibit-quit t)
-          (kill-buffer-hook (remq '+popup-kill-buffer-hook-h kill-buffer-hook)))
-      (cond ((get-buffer-window buffer t)
+  (let ((inhibit-quit t))
+    (cond ((not (buffer-live-p buffer)))
+          ((not (get-buffer-window buffer t))
+           (with-demoted-errors "Error killing transient buffer: %s"
+             (with-current-buffer buffer
+               (let ((kill-buffer-hook (remq '+popup-kill-buffer-hook-h kill-buffer-hook))
+                     confirm-kill-processes)
+                 (when-let (process (get-buffer-process buffer))
+                   (kill-process process))
+                 (let (kill-buffer-query-functions)
+                   ;; HACK The debugger backtrace buffer, when killed, called
+                   ;;      `top-level'. This causes jumpiness when the popup
+                   ;;      manager tries to clean it up.
+                   (cl-letf (((symbol-function #'top-level) #'ignore))
+                     (kill-buffer buffer)))))))
+          ((let ((ttl (if (= ttl 0)
+                          (or (plist-get +popup-defaults :ttl) 3)
+                        ttl)))
              (with-current-buffer buffer
                (setq +popup--timer
-                     (run-at-time ttl nil #'+popup--kill-buffer buffer ttl))))
-            ((eq ttl 0)
-             (kill-buffer buffer))
-            ((with-demoted-errors "Error killing transient buffer: %s"
-               (with-current-buffer buffer
-                 (let (confirm-kill-processes)
-                   (when-let (process (get-buffer-process buffer))
-                     (kill-process process))
-                   (let (kill-buffer-query-functions)
-                     ;; HACK The debugger backtrace buffer, when killed, called
-                     ;;      `top-level'. This causes jumpiness when the popup
-                     ;;      manager tries to clean it up.
-                     (cl-letf (((symbol-function #'top-level) #'ignore))
-                       (kill-buffer buffer)))))))))))
+                     (run-at-time ttl nil #'+popup--kill-buffer buffer ttl))))))))
 
 (defun +popup--delete-window (window)
   "Do housekeeping before destroying a popup window.
@@ -180,8 +181,7 @@ and enables `+popup-buffer-mode'."
     (let ((window (or window (selected-window))))
       (and (windowp window)
            (window-live-p window)
-           (or (window-parameter window 'popup)
-               (window-parameter window 'no-other-window))
+           (window-parameter window 'popup)
            window))))
 
 ;;;###autoload
@@ -393,8 +393,8 @@ This window parameter is ignored if FORCE-P is non-nil."
 
 ;;;###autoload
 (defun +popup/toggle ()
-  "If popups are open, close them. If they aren't, restore the last one or open
-the message buffer in a popup window."
+  "Toggle any visible popups.
+If no popups are available, display the *Messages* buffer in a popup window."
   (interactive)
   (let ((+popup--inhibit-transient t))
     (cond ((+popup-windows) (+popup/close-all t))
@@ -415,8 +415,9 @@ the message buffer in a popup window."
 
 ;;;###autoload
 (defun +popup/raise (window &optional arg)
-  "Raise the current popup window into a regular window.
-If prefix ARG, raise the current popup into a new window."
+  "Raise the current popup window into a regular window and
+return it. If prefix ARG, raise the current popup into a new
+window and return that window."
   (interactive
    (list (selected-window) current-prefix-arg))
   (cl-check-type window window)
@@ -428,19 +429,21 @@ If prefix ARG, raise the current popup into a new window."
     (+popup/close window 'force)
     (if arg
         (pop-to-buffer buffer)
-      (switch-to-buffer buffer))))
+      (switch-to-buffer buffer))
+    (selected-window)))
 
 ;;;###autoload
 (defun +popup/diagnose ()
   "Reveal what popup rule will be used for the current buffer."
   (interactive)
-  (or (cl-loop with bname = (buffer-name)
-               for (pred . action) in display-buffer-alist
-               if (and (functionp pred) (funcall pred bname action))
-               return (cons pred action)
-               else if (and (stringp pred) (string-match-p pred bname))
-               return (cons pred action))
-      (message "No popup rule for this buffer")))
+  (if-let (rule (cl-loop with bname = (buffer-name)
+                         for (pred . action) in display-buffer-alist
+                         if (and (functionp pred) (funcall pred bname action))
+                         return (cons pred action)
+                         else if (and (stringp pred) (string-match-p pred bname))
+                         return (cons pred action)))
+      (message "Rule matches: %s" rule)
+    (message "No popup rule for this buffer")))
 
 
 ;;

.emacs.d/modules/ui/popup/autoload/settings.el

@@ -68,7 +68,7 @@ PLIST can be made up of any of the following properties:
   is in :actions or `+popup-default-display-buffer-actions'.
 
 :size/:width/:height FLOAT|INT|FN
-  Determines the size of the popup. If more tha one of these size properties are
+  Determines the size of the popup. If more than one of these size properties are
   given :size always takes precedence, and is mapped with window-width or
   window-height depending on what :side the popup is opened. Setting a height
   for a popup that opens on the left or right is harmless, but comes into play