[PATCH v1] emacs: Forwarded messages should not have modified buffers

diff --git a/c9/f46e04fb954ee9eb42b57d4c5e23f322caca01 b/c9/f46e04fb954ee9eb42b57d4c5e23f322caca01
new file mode 100644 (file)
index 0000000..8fba6f3
--- /dev/null
+++ b/c9/f46e04fb954ee9eb42b57d4c5e23f322caca01
@@ -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 olra.theworths.org (Postfix) with ESMTP id 12B3C431FAF\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jun 2014 02:44:04 -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 vdaJGFZEYflq for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Jun 2014 02:43:59 -0700 (PDT)\r
+Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com\r
+       [209.85.212.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 23684431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jun 2014 02:43:59 -0700 (PDT)\r
+Received: by mail-wi0-f176.google.com with SMTP id n15so4142590wiw.9\r
+       for <notmuch@notmuchmail.org>; Mon, 02 Jun 2014 02:43:56 -0700 (PDT)\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:date:user-agent:from:message-id\r
+       :mime-version:content-type;\r
+       bh=C9zbaEGYGPUwS6H887mBf8IX0rBiwAK4+NbAjIBXuAQ=;\r
+       b=Rm76Vw9C+UkQ1+l8Me3upGTJfvoOr1FTp+Av+bhAs6mGtpjE78xiVj6un2pJPvqvFR\r
+       Rt4OpiXesPUL2HyYc3l4i45ONWp2Ci55rNjD7pNDxXodHXMvcjNegxw+7bp7nWVkAR1L\r
+       4sdl0eKfMxQWvY4yDs3IJc2lYbxawiiV6vROkePkyF/AvyqQw6UB3sdTXZfYsDYbXdNe\r
+       d6+/vAWkqypj/GDz47bEuunja59YNWrB1NIjZWyiH1mXWI5GdG/71w1knSJTcf1TSRBA\r
+       jjKkR2q7Cv2G28+qf21vDl+A9KViVzxyVvpseUjEYUjhhzHP8QuoRI6pCNllg9XZR35s\r
+       +dqA==\r
+X-Gm-Message-State:\r
+ ALoCoQmOIFHA7bnMjYrmz2+l3wiLNBflXUXki3Tmm8XnBLJ0OXhWczeQpIUYYu9q9Ga1OHy9Rf5u\r
+X-Received: by 10.194.243.3 with SMTP id wu3mr47791903wjc.29.1401702236458;\r
+       Mon, 02 Jun 2014 02:43:56 -0700 (PDT)\r
+Received: from localhost ([2a01:348:1a2:1:c1bc:5e8d:eeb5:792c])\r
+       by mx.google.com with ESMTPSA id l4sm31106628wiy.0.2014.06.02.02.43.54\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 02 Jun 2014 02:43:54 -0700 (PDT)\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1] emacs: Forwarded messages should not have modified buffers\r
+Date: Mon, 2 Jun 2014 10:40:18 +0100\r
+User-Agent: Notmuch/0.18 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+From: David Edmondson <dme@dme.org>\r
+Message-ID: <cunzjhv1wa5.fsf@gargravarr.hh.sledj.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\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: Mon, 02 Jun 2014 09:44:04 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+When the user begins forwarding a message, the resulting composition\r
+buffer should not be marked as modified, in order that it can\r
+immediately be killed without prompting.\r
+=2D--\r
+ emacs/notmuch-mua.el | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 95e4a4d..2c58886 100644\r
+=2D-- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -346,7 +346,8 @@ the From: address first."\r
+     (message-forward-make-body cur)\r
+     ;; `message-forward-make-body' shows the User-agent header.  Hide\r
+     ;; it again.\r
+=2D    (message-hide-headers)))\r
++    (message-hide-headers)\r
++    (set-buffer-modified-p nil)))\r
+=20\r
+ (defun notmuch-mua-new-reply (query-string &optional prompt-for-sender rep=\r
+ly-all)\r
+   "Compose a reply to the message identified by QUERY-STRING.\r
+=2D-=20\r
+2.0.0.rc2\r
+\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1\r
+\r
+iKYEARECAGYFAlOMR1NfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl\r
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDc1M0Y5NDJDMEExNjc3MDE4OURGMUYyMDY5\r
+RUNEMEFCRjA0OTY1MTYACgkQaezQq/BJZRZGYQCfWn+SGMta34t94xq8XMiqMY9x\r
+fTAAnA1CWfep/h/kpBBqNWwU5Ut07Gv3\r
+=ibps\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r