Merge pull request #2442 from vermiculus/sa/single-window

Don't die if the headers buffer isn't in a window
2023-03-16 07:17:34 +02:00 · 2023-03-16 07:17:34 +02:00 · 61a00df197
parent 96e16034c7 7f2225ccfc
commit 61a00df197
1 changed files with 6 additions and 4 deletions
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@ -155,10 +155,12 @@ Then, display the results."
            (docid (mu4e-message-field msg :docid)))
       (unless docid
         (mu4e-error "Message without docid: action is not possible"))
-       (with-current-buffer buffer
-         ;; make sure to select the window, or jumping won't
-         ;; be reflected.
-         (with-selected-window (get-buffer-window)
+
+       ;; make sure to select the window if possible, or jumping won't be
+       ;; reflected.
+       (with-selected-window (or (get-buffer-window buffer)
+                                 (get-buffer-window))
+         (with-current-buffer buffer
           (if (or (mu4e~headers-goto-docid docid)
                   ;; TODO: Is this the best way to find another
                   ;; relevant docid for a view buffer?