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

mu4e-draft/headers: resync headers-buf

Browse Source 
After restoring the window configuration, we could end up pointing at
the wrong message.

Let's try harder to restore... issue #2902.
This commit is contained in:
Dirk-Jan C. Binnema
2026-04-02 01:01:26 +03:00
committed by Seth Ladygo
parent 3527e20f5c
commit d7b0001f96
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mu4e/mu4e-draft.el
View File

@ -688,7 +688,31 @@ See `set-window-configuration' for further details."
(when mu4e--before-draft-window-config
;;(message "RESTORE to %s" mu4e--before-draft-window-config)
(set-window-configuration mu4e--before-draft-window-config)
(setq mu4e--before-draft-window-config nil)))
(setq mu4e--before-draft-window-config nil)
;; After restoring the window configuration, the headers cursor position
;; may be stale (the headers buffer can change during compose due to
;; re-indexing or flag updates). Re-sync with the view message. #2902.
(mu4e--compose-post-sync-headers)))
(declare-function mu4e-get-view-buffer "mu4e-window")
(declare-function mu4e~headers-goto-docid "mu4e-headers")
(declare-function mu4e~headers-highlight "mu4e-headers")
(defun mu4e--compose-post-sync-headers ()
"Sync the headers buffer cursor with the current view message.
After restoring the window configuration, the headers cursor may
point to the wrong message. Navigate to the message that the
view buffer is showing, if any."
(when-let* ((view-buf (mu4e-get-view-buffer))
(msg (with-current-buffer view-buf
(and (derived-mode-p 'mu4e-view-mode)
(bound-and-true-p mu4e--view-message))))
(docid (plist-get msg :docid))
(headers-buf (mu4e-get-headers-buffer)))
(when (buffer-live-p headers-buf)
(with-current-buffer headers-buf
(when (mu4e~headers-goto-docid docid)
(mu4e~headers-highlight docid))))))
(defvar mu4e--draft-activation-frame nil
"Frame from which composition was activated.

17
mu4e/mu4e-headers.el
View File

@ -912,18 +912,11 @@ If we're in the message view, temporarily switch."
(with-current-buffer buffer
(mu4e-thread-unfold-all)
(if (or (mu4e~headers-goto-docid docid)
;; TODO: Is this the best way to find another
;; relevant docid for a view buffer?
;;
;; If you attach a view buffer to another headers
;; buffer that does not contain the current docid
;; then `mu4e~headers-goto-docid' returns nil and we
;; get an error. This "hack" instead gets its
;; now-changed headers buffer's current message as a
;; docid
(mu4e~headers-goto-docid
(with-current-buffer buffer
(mu4e-message-field (mu4e-message-at-point) :docid))))
;; Docid lookup can fail when the headers buffer was
;; refreshed (e.g., re-indexing during compose). Fall
;; back to the stable message-id. #2902.
(mu4e-headers-goto-message-id
(mu4e-message-field msg :message-id)))
(progn ,@body)
(mu4e-error "Cannot find message in headers buffer")))))))