From d7ddfa0d0ec62c10ecd60779ca1edd9b6973593b Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 4 Jun 2021 20:05:31 -0300
Subject: [PATCH] emacs: drop setting mail-user-agent, and document how to set
 it

After some discussion [1], I decided it is better to make notmuch users
who rely on this behaviour customize mail-user-agent. This is
consistent with the behaviour of other emacs mail packages.

[1]: id:87k0nuhfrk.fsf@toryanderson.com
---
 NEWS                  |  7 +++++++
 doc/notmuch-emacs.rst | 10 ++++++++++
 emacs/notmuch.el      |  2 --
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 35b57cef..538ec168 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 Notmuch 0.33 (UNRELEASED)
 =========================
 
+Emacs
+-----
+
+`notmuch` no longer sets `mail-user-agent` on load. To restore the
+previous behaviour of using notmuch to send mail by default, customize
+`mail-user-agent` to `notmuch-user-agent`.
+
 Vim
 ---
 
diff --git a/doc/notmuch-emacs.rst b/doc/notmuch-emacs.rst
index d9b497a3..7772871b 100644
--- a/doc/notmuch-emacs.rst
+++ b/doc/notmuch-emacs.rst
@@ -366,6 +366,16 @@ Importing Mail
 :index:`notmuch-poll-script`
    |docstring::notmuch-poll-script|
 
+Sending Mail
+------------
+
+:index:`mail-user-agent`
+
+       Emacs consults the variable :ref:`mail-user-agent` to choose a mail
+       sending package for commands like :ref:`report-emacs-bug` and
+       :ref:`compose-mail`.  To use ``notmuch`` for this, customize this
+       variable to the symbol :ref:`notmuch-user-agent`.
+
 Init File
 ---------
 
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 6d37c623..3e2713e2 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -1162,8 +1162,6 @@ Point should be at the beginning of the line."
 
 ;;; _
 
-(setq mail-user-agent 'notmuch-user-agent)
-
 (provide 'notmuch)
 
 ;; After provide to avoid loops if notmuch was require'd via notmuch-init-file.