Re: message-default-mail-headers not working in notmuch 0.22

diff --git a/77/21ef960a0ab211ad888f18ea73cf152a700fb6 b/77/21ef960a0ab211ad888f18ea73cf152a700fb6
new file mode 100644 (file)
index 0000000..084a8e5
--- /dev/null
+++ b/77/21ef960a0ab211ad888f18ea73cf152a700fb6
@@ -0,0 +1,109 @@
+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 218626DE0355\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 07:34:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.181\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.181 tagged_above=-999 required=5\r
+ tests=[AWL=-0.114, 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 SJGzhufX_Gxt for <notmuch@notmuchmail.org>;\r
+ Fri, 29 Apr 2016 07:34:00 -0700 (PDT)\r
+Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com\r
+ [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 73D166DE0356 for\r
+ <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 07:34:00 -0700 (PDT)\r
+Received: by mail-wm0-f42.google.com with SMTP id n129so30268118wmn.1\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Apr 2016 07:34:00 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=to:subject:in-reply-to:references:from:date:message-id:mime-version;\r
+ bh=RYf1n/THyuVW+FPvo6KGEzUFqhS722YNfgSHZiq8PIQ=;\r
+ b=AkuDA5pIKOc7GcLpkhqrxM3ynux1e+JfeWdMoY1++tV17xmGGGU73ZcQ8ESE5Rg7Hq\r
+ pEzjYozfstFtlNOG7JvcKGWQIpa6JzLeJUlXrS73zFVqWDvh6SOWIptgZRo6JnpwCn5L\r
+ 1uq8j6FxoMbz4CoVvRpLd6iUH1+hXP2Z92lD67XLpDGKt1LarqimOGvhbTZ3FwO/UtJT\r
+ sW+Gd88Y1eEa4QfpxkqFL5QyFm+Akvepw4+Nyy/A9og8hh+fkiOlMKA2gcjKh3VT0eMt\r
+ fGg2ym7z9O0Y/4eELgVOZmM44FtNJTWtj1V30q/iZphB2yCHhRU5NnxWkTzmgl8/0/KD\r
+ St6Q==\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:to:subject:in-reply-to:references:from:date\r
+ :message-id:mime-version;\r
+ bh=RYf1n/THyuVW+FPvo6KGEzUFqhS722YNfgSHZiq8PIQ=;\r
+ b=NIaJz9YwuWcCPr5IrICu7EBUZ/sIlRvIg41M0bCtrIy9yW64emQw/wu4RdxrCZwNLR\r
+ CXngvzPQmYZT6hOqpWKI/nJT0iVR9NfdK/Mc8g0SPuG2ubP/6gm/cOrutrBXk0kn30OO\r
+ NDxv/T9UvN/OVs86v4Fi8N5CsApiOZzimLwUzOQGNzUStkkLPR/ndJG+vTN8+ktJy/dl\r
+ CyoxDR/6f97IHLqdWtF2rDlWp92pKvitzLmS3/7x4pN6TZutlTwSjy45HduqzS+KzmVC\r
+ 8zK78kGeCr3YHmnhuDkYLp9XUpX+yQcVcH1d8WQBcMxOo9vru0riuBrTSWQRUFjHBD3d\r
+ 0SSA==\r
+X-Gm-Message-State:\r
+ AOPr4FXd44pwlB91yWdj5pmHTYl/PMZ6E2VXgbiXdVoeK3pd9EqLnPB2gJsGF2ErPT6kqg==\r
+X-Received: by 10.28.25.67 with SMTP id 64mr4543395wmz.10.1461940438506;\r
+ Fri, 29 Apr 2016 07:33:58 -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 gt7sm15074119wjc.1.2016.04.29.07.33.57\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Fri, 29 Apr 2016 07:33:57 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 5a52364d;\r
+ Fri, 29 Apr 2016 14:33:56 +0000 (UTC)\r
+To: sfischme@uwaterloo.ca, Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: message-default-mail-headers not working in notmuch 0.22\r
+In-Reply-To: <87y47wmsfi.fsf@uwaterloo.ca>\r
+References: <87y47wmsfi.fsf@uwaterloo.ca>\r
+From: David Edmondson <dme@dme.org>\r
+Date: Fri, 29 Apr 2016 15:33:56 +0100\r
+Message-ID: <m2shy4eb6z.fsf@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Fri, 29 Apr 2016 14:34:09 -0000\r
+\r
+On Fri, Apr 29 2016, Sebastian Fischmeister wrote:\r
+> After upgrading to notmuch 0.22, my emacs config seems broken:\r
+>\r
+> (setq message-default-mail-headers "Reply-to: me@example.com\nBcc: me@example.com")\r
+>\r
+> When creating a new mail, it has no header other than "To:" and\r
+> "Subject:".\r
+>\r
+> Since I cannot find any item in the NEWS related to this release, is\r
+> this expected behaviour?\r
+\r
+No, it's not intended. Please try this patch:\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