From 13d068f183b674b656a929905bd8e4ac39ff073d Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Wed, 11 Oct 2023 09:47:54 +0300
Subject: [PATCH] mu4e: update headers/view for new composer

---
 mu4e/mu4e-headers.el |  5 +----
 mu4e/mu4e-view.el    | 10 +++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 72b41b76..9ff6e0be 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -984,10 +984,6 @@ after the end of the search results."
     (define-key map "a" #'mu4e-headers-action)
 
     ;; message composition
-    (define-key map "R" #'mu4e-compose-reply)
-    (define-key map "F" #'mu4e-compose-forward)
-    (define-key map "C" #'mu4e-compose-new)
-    (define-key map "E" #'mu4e-compose-edit)
 
     (define-key map (kbd "RET") #'mu4e-headers-view-message)
     (define-key map [mouse-2]   #'mu4e-headers-view-message)
@@ -1162,6 +1158,7 @@ The following specs are supported:
   (mu4e-context-minor-mode)
   (mu4e-update-minor-mode)
   (mu4e-search-minor-mode)
+  (mu4e-compose-minor-mode)
   (hl-line-mode 1)
 
   (mu4e--modeline-register #'mu4e--search-modeline-item)
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 3548420c..6962d548 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -721,8 +721,8 @@ determine which browser function to use."
             (detect-coding-region (point-min) (point-max) t)))
          ;; Possibly add headers (before "Attachments")
          (gnus-display-mime-function (mu4e--view-gnus-display-mime msg))
-         (gnus-icalendar-additional-identities
-          (mu4e-personal-addresses 'no-regexp)))
+         (message-alternative-emails
+          (mu4e-personal-or-alternative-address)))
     (condition-case err
         (progn
           (mm-enable-multibyte)
@@ -905,11 +905,6 @@ This is useful for advising some Gnus-functionality that does not work in mu4e."
     (define-key map "k" #'mu4e-view-save-url)
     (define-key map "f" #'mu4e-view-fetch-url)
 
-    (define-key map "F" #'mu4e-compose-forward)
-    (define-key map "R" #'mu4e-compose-reply)
-    (define-key map "C" #'mu4e-compose-new)
-    (define-key map "E" #'mu4e-compose-edit)
-
     (define-key map "." #'mu4e-view-raw-message)
     (define-key map "," #'mu4e-sexp-at-point)
     (define-key map "|" #'mu4e-view-pipe)
@@ -1067,6 +1062,7 @@ Based on Gnus' article-mode."
   (use-local-map mu4e-view-mode-map)
   (mu4e-context-minor-mode)
   (mu4e-search-minor-mode)
+  (mu4e-compose-minor-mode)
   (setq buffer-undo-list t) ;; don't record undo info
 
   ;; support bookmarks.