alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu4e: be more careful deleting frames

Browse Source 
Remember the exact frame we created, and only kill that one.

Ensure mu4e-compose-post-hook fires at most once.
This commit is contained in:
Dirk-Jan C. Binnema
2026-04-08 00:30:44 +03:00
committed by Seth Ladygo
parent 0ca6389c03
commit 23e28fd1ae
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mu4e/mu4e-compose.el
View File

@ -91,8 +91,6 @@ This multiplexes the `message-mode' hooks `message-send-actions',
:type 'hook
:group 'mu4e-compose)
(defvar mu4e-captured-message)
(defun mu4e-compose-attach-captured-message ()
"Insert the last captured message file as an attachment.

32
mu4e/mu4e-draft.el
View File

@ -716,16 +716,20 @@ view buffer is showing, if any."
(defvar mu4e--draft-activation-frame nil
"Frame from which composition was activated.
Used internally for mu4e-compose-post-kill-frame.")
Used internally for `mu4e-compose-post-kill-frame'.")
(defvar mu4e--draft-compose-frame nil
"Frame in which the composition buffer is displayed.
Used internally for `mu4e-compose-post-kill-frame'.")
(defun mu4e-compose-post-kill-frame ()
"Function that might kill the composition frame.
This is for use in `mu4e-compose-post-hook'."
(let ((msgframe (selected-frame)))
(when (and mu4e--draft-activation-frame
(frame-live-p msgframe)
(not (eq mu4e--draft-activation-frame msgframe)))
(delete-frame msgframe))))
(when-let* ((compose-frame mu4e--draft-compose-frame)
(activation-frame mu4e--draft-activation-frame))
(when (and (frame-live-p compose-frame)
(not (eq activation-frame compose-frame)))
(delete-frame compose-frame))))
(defvar mu4e-message-post-action nil
"Runtime variable for use with `mu4e-compose-post-hook'.
@ -733,15 +737,24 @@ It contains a symbol denoting the action that triggered the hook,
either `send', `exit', `kill' or `postpone'.")
(defvar mu4e-compose-post-hook)
(defvar-local mu4e--post-hook-done nil
"Whether `mu4e-compose-post-hook' has already run for this buffer.")
(defun mu4e--message-post-actions (trigger)
"Invoked after we're done with a message with TRIGGER.
See `mu4e-message-post-action' for the available triggers.
I.e. this multiplexes the `message-(send|exit|kill|postpone)-actions';
with the mu4e-message-post-action set accordingly."
(setq mu4e-message-post-action trigger)
(run-hooks 'mu4e-compose-post-hook))
with the mu4e-message-post-action set accordingly.
The hook is run at most once per compose buffer; e.g. send-and-exit
triggers both `send' and `exit' actions but only the first one
fires the hook."
(unless mu4e--post-hook-done
(setq mu4e--post-hook-done t)
(setq mu4e-message-post-action trigger)
(run-hooks 'mu4e-compose-post-hook)))
(defun mu4e--prepare-post (&optional oldframe oldwindconf)
"Prepare the `mu4e-compose-post-hook` handling.
@ -754,6 +767,7 @@ window configuration."
;; each composition buffer tracks its *own* activation context, which is
;; needed when multiple compositions exist simultaneously.
(setq-local mu4e--draft-activation-frame oldframe
mu4e--draft-compose-frame (selected-frame)
mu4e--before-draft-window-config oldwindconf)
;; make message's "post" hooks local, and multiplex them