[PATCH v1 2/2] emacs: Tell `message-mode' that outgoing messages are email.

diff --git a/d3/450b4cae5476e2546de6ea1da0ff35bd763bb9 b/d3/450b4cae5476e2546de6ea1da0ff35bd763bb9
new file mode 100644 (file)
index 0000000..47d098c
--- /dev/null
+++ b/d3/450b4cae5476e2546de6ea1da0ff35bd763bb9
@@ -0,0 +1,110 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 289BF6DE0361\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 23:52:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.182\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.182 tagged_above=-999 required=5\r
+ tests=[AWL=-0.115, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id vurnOEf-djhe for <notmuch@notmuchmail.org>;\r
+ Fri, 29 Apr 2016 23:52:00 -0700 (PDT)\r
+Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com\r
+ [74.125.82.41]) by arlo.cworth.org (Postfix) with ESMTPS id 794356DE0352 for\r
+ <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 23:51:54 -0700 (PDT)\r
+Received: by mail-wm0-f41.google.com with SMTP id v200so13615112wmv.1\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 23:51:54 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id:in-reply-to:references;\r
+ bh=fXnPH/khxsmjkRaxJh05LGDp16abDT56qjnyQfUn/dE=;\r
+ b=0v+l5b59AL4hETp02pdg2SqAWOMPFh29G1YMTXrKiScTsdY1CrVVr4hT/As23fH3Oq\r
+ M6PAu9GBsuVXKIkI5FwBCFg1v/6mgHwXTDuQAezm/OXQ8xwERMHnLcECQxJ8jewRENYi\r
+ MF9dFGAoYHLDhDrQlV6IAMCq1FCRy3ZIw3vwZ9acQHA/y+nXiQIlD8mlnub8Zy7N/6th\r
+ mxiFZTXSCsN0lwVboMvNbjxHXAHC7Z1ZMEBEs9lnPA1s4AP6dqoGHdiUc58u8wfEgqXM\r
+ /zr6yHNuQW3zPT2wcs1ZncOSHz6wVVRug/5dhrcECGkdhAjPNhxmSHVLqKA/5MdRO3Ia\r
+ m7xw==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=fXnPH/khxsmjkRaxJh05LGDp16abDT56qjnyQfUn/dE=;\r
+ b=jAn+q2Zk0z1TawRK+027qJVwb/jsZuUc/QxHdkVISVd1nC6mLaFtiJTd9RcBJHGIFc\r
+ XQgDAuUKuj/mN37pA5hph4PmGUJb0LCob8yM9egJTg7NBy0je1YaFLmy6RKabB3jo8EZ\r
+ QObeVTZDngm57pyUWW+oZfqFOPyzGXaK7xvIrHfH1pbOq6s9vy50sxC4eLgzhCIOjMD1\r
+ 9HYGIMYS2sXnZGYT5S5dXtgbOhFNmVdEYI0ODwECiMattWPEbSYodJoOCXQRxW+wGrWi\r
+ kdpGU7RUlA7uNEyHrEoNjsLtboCF7+59VmvLTcQRg1oX8Dr2scWwJl+wiJ1p0nWqxfCo\r
+ kt0w==\r
+X-Gm-Message-State:\r
+ AOPr4FU4GCeYLA4pD4cxC1CXfppftNd7bU0f+WHdMGTc3VcwVvitBiHQI9gcCuBZcRJWSQ==\r
+X-Received: by 10.194.203.105 with SMTP id kp9mr158541wjc.70.1461999113181;\r
+ Fri, 29 Apr 2016 23:51:53 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id kj9sm18311685wjb.14.2016.04.29.23.51.51\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Fri, 29 Apr 2016 23:51:52 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 55e1416d\r
+ for <notmuch@notmuchmail.org>; Sat, 30 Apr 2016 06:51:48 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1 2/2] emacs: Tell `message-mode' that outgoing messages are\r
+ email.\r
+Date: Sat, 30 Apr 2016 07:51:48 +0100\r
+Message-Id: <1461999108-68582-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.7.1\r
+In-Reply-To: <1461999108-68582-1-git-send-email-dme@dme.org>\r
+References: <1461999108-68582-1-git-send-email-dme@dme.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 30 Apr 2016 06:52:08 -0000\r
+\r
+When composing messages (including replies, etc.), indicate to\r
+`message-mode' definitively that the message is email (as opposed to\r
+Usenet news) rather than having it attempt to determine this for itself.\r
+\r
+This causes `message-mode' to observe such variables as\r
+`message-default-mail-headers', which previously happened haphazardly.\r
+---\r
+ emacs/notmuch-mua.el | 5 ++++-\r
+ 1 file changed, 4 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 0445975..399e138 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -338,7 +338,10 @@ modified. This function is notmuch addaptation of\r
+         ;; We need to convert any string input, eg from rmail-start-mail.\r
+         (dolist (h other-headers other-headers)\r
+           (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))\r
+-      (args (list yank-action send-actions)))\r
++      (args (list yank-action send-actions))\r
++      ;; Cause `message-setup-1' to do things relevant for mail,\r
++      ;; such as observe `message-default-mail-headers'.\r
++      (message-this-is-mail t))\r
+     ;; message-setup-1 in Emacs 23 does not accept return-action\r
+     ;; argument. Pass it only if it is supplied by the caller. This\r
+     ;; will never be the case when we're called by `compose-mail' in\r
+-- \r
+2.7.1\r
+\r