Re: bug in emacs reply code?

diff --git a/1f/52a048a9fd40afe66021c00807a34e18b2fa7d b/1f/52a048a9fd40afe66021c00807a34e18b2fa7d
new file mode 100644 (file)
index 0000000..8e9fe6a
--- /dev/null
+++ b/1f/52a048a9fd40afe66021c00807a34e18b2fa7d
@@ -0,0 +1,105 @@
+Return-Path: <jani@nikula.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 olra.theworths.org (Postfix) with ESMTP id AC6D6431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Mar 2012 03:13:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id KElanK3ioeNG for <notmuch@notmuchmail.org>;\r
+       Wed, 28 Mar 2012 03:13:13 -0700 (PDT)\r
+Received: from mail-qa0-f43.google.com (mail-qa0-f43.google.com\r
+       [209.85.216.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0B381431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Mar 2012 03:13:12 -0700 (PDT)\r
+Received: by qadb15 with SMTP id b15so65804qad.2\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Mar 2012 03:13:11 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=s/SUtTxS+CPuJpgn5wFWhbZVztV2lNSgRaAU3br7GCY=;\r
+       b=AThIi7JYIoIWRCSmag+afBVujuuiHjjclV0AYQMfdC8TL67PECFSwLHObJqQLmDmGH\r
+       pf474ghp0Wm+IGQrLve+lWh6LlEULoz25+0fLPzzuYbm3drPLsomr39zbg5H7WEzwH8r\r
+       fifuhFmkPRmAOSSCjmz0GRlDXP4ByzUi/9B5R4u9CiqHwJLapjk6uHogTKQa2Fq8N7Yf\r
+       ht7u90uBrOh4gYQwniVpn53l7koIuZ+1aaVDhtDpc8ggIq3zO6VhviXtzbKYEgY/D1K1\r
+       5s4L0PX/s60BJ6px/OwtuxjvTWfhaY2jAA8fPIYj7B/Ix9C8ymVcShLBST4IgbXpmCxF\r
+       D5bA==\r
+Received: by 10.229.136.79 with SMTP id q15mr11033220qct.149.1332929591203;\r
+       Wed, 28 Mar 2012 03:13:11 -0700 (PDT)\r
+Received: from localhost (nikula.org. [92.243.24.172])\r
+       by mx.google.com with ESMTPS id j17sm5755831qaj.9.2012.03.28.03.13.08\r
+       (version=SSLv3 cipher=OTHER); Wed, 28 Mar 2012 03:13:10 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: bug in emacs reply code?\r
+In-Reply-To: <87r4we3wp7.fsf@nikula.org>\r
+References: <87r4we3wp7.fsf@nikula.org>\r
+User-Agent: Notmuch/0.11.1+222~ga47a98c (http://notmuchmail.org) Emacs/23.1.1\r
+       (i686-pc-linux-gnu)\r
+Date: Wed, 28 Mar 2012 10:13:05 +0000\r
+Message-ID: <87obrh3ufi.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQkTd6s8BDCjknQPNVYpCE0boE9uaC0/Y+ijZPe7F4MuOxHOWRHpZPpP8+i1Uvc8Bw922/aZ\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 28 Mar 2012 10:13:17 -0000\r
+\r
+On Tue, 27 Mar 2012 15:11:48 +0000, Jani Nikula <jani@nikula.org> wrote:\r
+> \r
+> Hi all, just upgraded from 0.11 to master on one machine, and emacs\r
+> reply started failing as follows. The four tests fail, all others pass.\r
+> \r
+> $ emacs --version\r
+> GNU Emacs 23.2.1\r
+\r
+I bisected the problem to commit "emacs: Use the new JSON reply format\r
+and message-cite-original" 650123510cfa64caf6b20f5239f43433fa6f2941.\r
+\r
+Following up Adam's suggestion, it boils down to a change in emacs\r
+message-mail function in lisp/gnus/message.el. If I eval-defun the\r
+message-mail from 23.3, the UI seems to work. The diff between the\r
+versions is below. That bit of elisp is beyond me, please look into it.\r
+\r
+BR,\r
+Jani.\r
+\r
+--- emacs-23.2/lisp/gnus/message.el     2010-04-23 17:59:51.000000000+0300\r
++++ emacs-23.3/lisp/gnus/message.el     2011-11-26 05:20:20.000000000+0200\r
+[...]\r
+@@ -6487,7 +6513,13 @@\r
+     (message-setup\r
+      (nconc\r
+       `((To . ,(or to "")) (Subject . ,(or subject "")))\r
+-      (when other-headers other-headers))\r
++      ;; C-h f compose-mail says that headers should be specified as\r
++      ;; (string . value); however all the rest of message expects\r
++      ;; headers to be symbols, not strings (eg message-header-format-alist).\r
++      ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html\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
+      yank-action send-actions continue switch-function)\r
+     ;; FIXME: Should return nil if failure.\r
+     t))\r
+@@ -8189,5 +8221,4 @@\r
+[...]\r