From b428d9702e3169ef761dcdf9b6ea7e38a6453fee Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Fri, 3 Nov 2023 21:10:49 +0200
Subject: [PATCH] mu4e-compose: make mu4e-compose-dont-reply-to-self obsolete

Doesn't really fit in nicely with the new composer; update NEWS.org,
manual for users to migrate.
---
 NEWS.org              |  5 +++++
 mu4e/mu4e-compose.el  | 28 ++--------------------------
 mu4e/mu4e-obsolete.el |  6 +++++-
 mu4e/mu4e.texi        |  9 +++++----
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 50094bd9..786939c6 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -78,6 +78,11 @@
       ~mu4e-compose-reply-ignore-address~ is no longer supported, use
       ~message-prune-recipient-rules~ instead.
 
+      Same for ~mu4e-compose-dont-reply-to-self~; roughly the same effect can be
+      achieved by setting ~message-dont-reply-to-names~ to
+      ~#'mu4e-personal-or-alternative-address-p~. This only works for
+      [[info:(message) Wide Reply][wide-replies]].
+
     - The special mailing list handling is gone; ~mu4e-compose-reply~ and
       ~mu4e-compose-wide-reply~ should take care of that. There's also
       ~message-reply-to-function~ for ultimate control; see [[info:(message)
diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 631a6e88..c366268d 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -177,26 +177,6 @@ the place to do that."
   :type 'hook
   :group 'mu4e-compose)
 
-(defcustom mu4e-compose-dont-reply-to-self nil
-  "If non-nil, do not include self.
-
-Whether a given address belongs to this user (the \"self\") is
-determined by `mu4e-personal-or-alternative-address-p', which
-overrides `message-dont-reply-to-names' when replying to
-messages, if `mu4e-compose-dont-reply-to-self' is non-nil."
-  :type 'boolean
-  :group 'mu4e-compose)
-
-(defcustom mu4e-compose-reply-recipients 'ask
-  "Which recipients to use when replying to a message.
-May be a symbol `ask', `all', `sender'.  Note that this option
-only applies to non-mailing-list message; for mailing-list
-messages, mu4e always asks."
-  :type '(choice (const ask)
-                 (const all)
-                 (const sender))
-  :group 'mu4e-compose)
-
 
 ;;; Runtime variables; useful for user-hooks etc.
 (defvar-local mu4e-compose-parent-message nil
@@ -773,12 +753,8 @@ of message."
   (mu4e--compose-setup
    'reply
    (lambda (parent)
-     (let ((message-dont-reply-to-names
-            (if mu4e-compose-dont-reply-to-self
-                message-dont-reply-to-names
-              #'mu4e-personal-or-alternative-address-p)))
-       (message-reply nil wide)
-       (insert (mu4e--compose-cite parent))))))
+     (message-reply nil wide)
+     (insert (mu4e--compose-cite parent)))))
 
 ;;;###autoload
 (defun mu4e-compose-wide-reply ()
diff --git a/mu4e/mu4e-obsolete.el b/mu4e/mu4e-obsolete.el
index 8cde37dc..e02f2af2 100644
--- a/mu4e/mu4e-obsolete.el
+++ b/mu4e/mu4e-obsolete.el
@@ -249,7 +249,6 @@
 (make-obsolete-variable 'mu4e-user-mail-address-list
                         "determined by server; see `mu4e-personal-addresses'."
                         "1.3.8")
-
 (make-obsolete-variable 'mu4e-contact-rewrite-function
                         "mu4e-contact-process-function (see docstring)"
                         "1.3.2")
@@ -263,6 +262,11 @@
 (make-obsolete-variable 'mu4e-compose-reply-ignore-address
                         "see: message-prune-recipient-rules" "1.11.23")
 
+;; this is only a _rough_
+(make-obsolete-variable 'mu4e-compose-dont-reply-to-self
+                        "message-dont-reply-to-names"
+                        "1.11.24")
+
 ;; calendar
 (define-obsolete-function-alias 'mu4e-icalendar-setup #'ignore '"1.11.22")
 
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 333c6ea0..9eceea2c 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -1881,10 +1881,11 @@ configuration:
 @lisp
 (setq message-kill-buffer-on-exit t)
 @end lisp
-@item If you want to exclude your own e-mail address when ``replying to
-all'', set @code{mu4e-compose-dont-reply-to-self} to @code{t}. In
-order for this to work properly you need to pass your address to
-@command{mu init --my-address=} at database initialization time.
+@item If you want to exclude your own e-mail addresses when ``replying to
+all'', set @code{message-dont-reply-to-names} to
+@code{mu4e-personal-or-alternative-address-p}. In order for this to work
+properly you need to pass your address to @command{mu init --my-address=} at
+database initialization time, and/or use @t{message-alternative-emails}.
 @end itemize
 
 @node Searching