From d6c67a401dba4b667c170cb5f74fd1880a38c89a Mon Sep 17 00:00:00 2001 From: Mickey Petersen Date: Wed, 30 Nov 2022 15:33:07 +0000 Subject: [PATCH] Check for detached view in the navigation context macro --- mu4e/mu4e-view.el | 5 ++++- mu4e/mu4e-window.el | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el index de5e9bc6..63c24bf0 100644 --- a/mu4e/mu4e-view.el +++ b/mu4e/mu4e-view.el @@ -156,7 +156,10 @@ Then, display the results." ;; are we already inside a headers buffer? ((mu4e-current-buffer-type-p 'headers) (current-buffer)) ;; if not, are we inside a view buffer, and does it have linked headers buffer? - ((mu4e-current-buffer-type-p 'view) (mu4e-get-headers-buffer)) + ((mu4e-current-buffer-type-p 'view) + (when (mu4e--view-detached-p (current-buffer)) + (mu4e-error "You cannot navigate in a detached view buffer.")) + (mu4e-get-headers-buffer)) ;; fallback; but what would trigger this? (t (mu4e-get-headers-buffer)))) (docid (mu4e-message-field msg :docid))) diff --git a/mu4e/mu4e-window.el b/mu4e/mu4e-window.el index e17580dc..4ef74f3d 100644 --- a/mu4e/mu4e-window.el +++ b/mu4e/mu4e-window.el @@ -80,7 +80,8 @@ generated name does not already exist." ;; detached -- raise an error. (and (mu4e-current-buffer-type-p 'view) (or mu4e-linked-headers-buffer - (error "This view buffer is detached"))) + ;; (error "This view buffer is detached") + )) ;; if we're already in a headers buffer then ;; that is the one we use. (and (mu4e-current-buffer-type-p 'headers)