emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure the linked headers buffer state is not lost

This commit is contained in:
Mickey Petersen 2022-12-03 15:12:31 +00:00
parent d0ae875527
commit d43c0030e3
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mu4e/mu4e-headers.el
View File

@ -1611,7 +1611,7 @@ _not_ refresh the last search with the new setting for threading."
(if (functionp mu4e-view-auto-mark-as-read) (if (functionp mu4e-view-auto-mark-as-read)
(funcall mu4e-view-auto-mark-as-read msg) (funcall mu4e-view-auto-mark-as-read msg)
mu4e-view-auto-mark-as-read))) mu4e-view-auto-mark-as-read)))
(when-let ((buf (mu4e-get-view-buffer nil nil))) (when-let ((buf (mu4e-get-view-buffer (current-buffer) nil)))
(with-current-buffer buf (with-current-buffer buf
(mu4e-loading-mode 1))) (mu4e-loading-mode 1)))
(mu4e--server-view docid mark-as-read))) (mu4e--server-view docid mark-as-read)))

44
mu4e/mu4e-view.el
View File

@ -155,7 +155,8 @@ Then, display the results."
(buffer (cond (buffer (cond
;; are we already inside a headers buffer? ;; are we already inside a headers buffer?
((mu4e-current-buffer-type-p 'headers) (current-buffer)) ((mu4e-current-buffer-type-p 'headers) (current-buffer))
;; if not, are we inside a view buffer, and does it have linked headers buffer? ;; if not, are we inside a view buffer, and does
;; it have linked headers buffer?
((mu4e-current-buffer-type-p 'view) ((mu4e-current-buffer-type-p 'view)
(when (mu4e--view-detached-p (current-buffer)) (when (mu4e--view-detached-p (current-buffer))
(mu4e-error "You cannot navigate in a detached view buffer.")) (mu4e-error "You cannot navigate in a detached view buffer."))
@ -177,8 +178,9 @@ Then, display the results."
;; get an error. This "hack" instead gets its ;; get an error. This "hack" instead gets its
;; now-changed headers buffer's current message as a ;; now-changed headers buffer's current message as a
;; docid ;; docid
(mu4e~headers-goto-docid (with-current-buffer (mu4e-get-headers-buffer) (mu4e~headers-goto-docid
(mu4e-message-field (mu4e-message-at-point) :docid)))) (with-current-buffer buffer
(mu4e-message-field (mu4e-message-at-point) :docid))))
,@body ,@body
(mu4e-error "Cannot find message in headers buffer")))))) (mu4e-error "Cannot find message in headers buffer"))))))
@ -608,19 +610,29 @@ As a side-effect, a message that is being viewed loses its
;; feasible to recycle an existing buffer due to buffer-specific ;; feasible to recycle an existing buffer due to buffer-specific
;; state (buttons, etc.) that can interfere with message rendering ;; state (buttons, etc.) that can interfere with message rendering
;; in gnus. ;; in gnus.
(when-let ((existing-buffer (mu4e-get-view-buffer nil nil))) ;;
(delete-windows-on existing-buffer t) ;; Unfortunately that does create its own issues: namely ensuring
(kill-buffer existing-buffer)) ;; buffer-local state that *must* survive is correctly copied
(setq gnus-article-buffer (mu4e-get-view-buffer nil t)) ;; across.
(with-current-buffer gnus-article-buffer (let ((linked-headers-buffer))
(let ((inhibit-read-only t)) (when-let ((existing-buffer (mu4e-get-view-buffer nil nil)))
(remove-overlays (point-min)(point-max) 'mu4e-overlay t) ;; required; this state must carry over from the killed buffer
(erase-buffer) ;; to the new one.
(insert-file-contents-literally (setq linked-headers-buffer mu4e-linked-headers-buffer)
(mu4e-message-readable-path msg) nil nil nil t) (delete-windows-on existing-buffer t)
(setq-local mu4e~view-message msg) (kill-buffer existing-buffer))
(mu4e~view-render-buffer msg)) (setq gnus-article-buffer (mu4e-get-view-buffer nil t))
(mu4e-loading-mode 0)) (with-current-buffer gnus-article-buffer
(when linked-headers-buffer
(setq mu4e-linked-headers-buffer linked-headers-buffer))
(let ((inhibit-read-only t))
(remove-overlays (point-min)(point-max) 'mu4e-overlay t)
(erase-buffer)
(insert-file-contents-literally
(mu4e-message-readable-path msg) nil nil nil t)
(setq-local mu4e~view-message msg)
(mu4e~view-render-buffer msg))
(mu4e-loading-mode 0)))
(unless (mu4e--view-detached-p gnus-article-buffer) (unless (mu4e--view-detached-p gnus-article-buffer)
(with-current-buffer mu4e-linked-headers-buffer (with-current-buffer mu4e-linked-headers-buffer
;; We need this here as we want to avoid displaying the buffer until ;; We need this here as we want to avoid displaying the buffer until