emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/popup: fix arrayp errors when killing transient buffers

Browse source
This commit is contained in:
Henrik Lissner 2018-01-06 04:52:37 -05:00
parent f087f731ef
commit 4df471e53a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/feature/popup/autoload.el
View file

@ -17,15 +17,14 @@
(window-parameter w 'alist) (window-parameter w 'alist)
(window-state-get w))))) (window-state-get w)))))
(defun +popup--kill-buffer (buffer) (defun +popup--kill-buffer (buffer ttl)
"Tries to kill BUFFER, as was requested by a transient timer. If it fails, eg. "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." the buffer is visible, then set another timer and try again later."
(when (buffer-live-p buffer) (when (buffer-live-p buffer)
(if (get-buffer-window buffer) (if (get-buffer-window buffer)
(with-current-buffer buffer (with-current-buffer buffer
(setq +popup--timer (setq +popup--timer
(run-at-time (timer--time +popup--timer) (run-at-time ttl nil #'+popup--kill-buffer buffer ttl)))
nil #'+popup--kill-buffer buffer)))
(with-demoted-errors "Error killing transient buffer: %s" (with-demoted-errors "Error killing transient buffer: %s"
(let ((inhibit-message (not doom-debug-mode))) (let ((inhibit-message (not doom-debug-mode)))
(message "Cleaned up transient buffer: %s" buffer)) (message "Cleaned up transient buffer: %s" buffer))
@ -71,7 +70,7 @@ and enables `+popup-buffer-mode'."
(if (= ttl 0) (if (= ttl 0)
(+popup--kill-buffer buffer) (+popup--kill-buffer buffer)
(setq +popup--timer (setq +popup--timer
(run-at-time ttl nil #'+popup--kill-buffer buffer)))))))) (run-at-time ttl nil #'+popup--kill-buffer buffer ttl))))))))
(defun +popup--normalize-alist (alist) (defun +popup--normalize-alist (alist)
"Merge `+popup-default-alist' and `+popup-default-parameters' with ALIST." "Merge `+popup-default-alist' and `+popup-default-parameters' with ALIST."