[RFC] [PATCH v1] emacs: More citation washing.

diff --git a/ab/3d08bbc87f78ad5ebfd7c4c55d17025a8a0456 b/ab/3d08bbc87f78ad5ebfd7c4c55d17025a8a0456
new file mode 100644 (file)
index 0000000..6dd1fd3
--- /dev/null
+++ b/ab/3d08bbc87f78ad5ebfd7c4c55d17025a8a0456
@@ -0,0 +1,106 @@
+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 D4E42431FC9\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 03:16:33 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001]\r
+       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 LdHam4X-T8Kb for <notmuch@notmuchmail.org>;\r
+       Fri, 31 Oct 2014 03:16:28 -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 3203B431FC2\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 03:16:28 -0700 (PDT)\r
+Received: by mail-wi0-f176.google.com with SMTP id h11so871655wiw.3\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 03:16:26 -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:user-agent:from:to:subject:date:message-id;\r
+       bh=IeMMGfAEx+kjLf/ZcUVAPv+aUJynreLzANWPVX3qwpE=;\r
+       b=YqGAWj3NvdBoVA9g8Fn4gBQ8gRIkRyOv+tnBKEGDS56rN4apCh2Sx+5+3GyEFPpQzV\r
+       cDbyVfIQ+EPDjXfoYMTwuRG8Hzgdebxy8Rei/kjGHPBYgVQ7Vz/itg0JqbU85RIH7DtF\r
+       tLkRaS9lpJ/bmeIYdv6DxM4viLYp7w5JDRE5H+NrtlYzhy9x8buRhCsy/eHntsv/mevw\r
+       dMM5TqZSGsqIbgJaxIhV6gCGjNaVy2OjSW6xtpWGBJjTc9a4N2XzoE99ZahiuOubyyLK\r
+       RkIo7/khB6HNf7H3EeLFDhO+dvq1tV2APCOzJC72O+wr9/nqVKLY3bLR8/WKJLvN7NGG\r
+       cbRQ==\r
+X-Gm-Message-State:\r
+ ALoCoQk+R6dMYoGNjXXwHgHuwaCPx+L8RhfRMvxA8hSSnrOhOV9jhOb2KzTCHt3wvYtsoT/LV38g\r
+X-Received: by 10.194.3.78 with SMTP id a14mr1939353wja.107.1414750586690;\r
+       Fri, 31 Oct 2014 03:16:26 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.\r
+       [81.149.164.25])\r
+       by mx.google.com with ESMTPSA id j20sm11572643wjn.0.2014.10.31.03.16.25\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Fri, 31 Oct 2014 03:16:25 -0700 (PDT)\r
+Received: from localhost (30000@localhost [local]);\r
+       by localhost (OpenSMTPD) with ESMTPA id 11a6aee0;\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 10:16:07 +0000 (UTC)\r
+User-Agent: OpenSMTPD enqueuer (Demoostik)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC] [PATCH v1] emacs: More citation washing.\r
+Date: Fri, 31 Oct 2014 10:16:07 +0000\r
+Message-Id: <1414750567-25077-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.9.3 (Apple Git-50)\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: Fri, 31 Oct 2014 10:16:34 -0000\r
+\r
+Ensure that a citation is preceded and followed by a blank line,\r
+unless the preceding line looks like a citation leader.\r
+---\r
+\r
+Washing changes are always a bit risky, as they are heuristic\r
+based. Testers for this (alleged) improvement welcome!\r
+\r
+ emacs/notmuch-wash.el | 14 +++++++++++++-\r
+ 1 file changed, 13 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 8fe91e1..83621bb 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -276,7 +276,19 @@ Perform several transformations on the message body:\r
+   ;; text.\r
+   (goto-char (point-min))\r
+   (while (re-search-forward "\\(^>[> ]*\n\\)\\(^$\\|^[^>].*\\)" nil t)\r
+-    (replace-match "\\2")))\r
++    (replace-match "\\2"))\r
++\r
++  ;; Ensure that a citation block has a blank line before it, unless\r
++  ;; the previous line ends in ':' (because that's probably the\r
++  ;; citation).\r
++  (goto-char (point-min))\r
++  (while (re-search-forward "^[^>].*[^:]\\(\n\\)>.*" nil t)\r
++    (replace-match "\n\n" nil nil nil 1))\r
++\r
++  ;; Ensure that a citation block has a blank line after it.\r
++  (goto-char (point-min))\r
++  (while (re-search-forward "^>.*\\(\n\\)[^>].*" nil t)\r
++    (replace-match "\n\n" nil nil nil 1)))\r
+ \r
+ ;;\r
+ \r
+-- \r
+1.9.3 (Apple Git-50)\r
+\r