[PATCH] emacs: Correctly count the number of lines in a signature.

diff --git a/22/e64b03837c0a7035bbafd12c68893ece476813 b/22/e64b03837c0a7035bbafd12c68893ece476813
new file mode 100644 (file)
index 0000000..bb40859
--- /dev/null
+++ b/22/e64b03837c0a7035bbafd12c68893ece476813
@@ -0,0 +1,71 @@
+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 439F740DAF9\r
+       for <notmuch@notmuchmail.org>; Tue,  9 Nov 2010 10:17:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham\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 R7KCMQhM9mHW for <notmuch@notmuchmail.org>;\r
+       Tue,  9 Nov 2010 10:16:52 -0800 (PST)\r
+Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com\r
+       [209.85.215.181])\r
+       by olra.theworths.org (Postfix) with ESMTP id D674A40DAFA\r
+       for <notmuch@notmuchmail.org>; Tue,  9 Nov 2010 10:16:51 -0800 (PST)\r
+Received: by eyb6 with SMTP id 6so4420911eyb.26\r
+       for <notmuch@notmuchmail.org>; Tue, 09 Nov 2010 10:16:51 -0800 (PST)\r
+Received: by 10.216.59.77 with SMTP id r55mr5552466wec.6.1289326610617;\r
+       Tue, 09 Nov 2010 10:16:50 -0800 (PST)\r
+Received: from ut.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com\r
+       [81.149.164.25])\r
+       by mx.google.com with ESMTPS id 7sm1080578wet.0.2010.11.09.10.16.47\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Tue, 09 Nov 2010 10:16:48 -0800 (PST)\r
+Received: by ut.hh.sledj.net (Postfix, from userid 1000)\r
+       id 4E1E559405B; Tue,  9 Nov 2010 18:15:32 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Correctly count the number of lines in a signature.\r
+Date: Tue,  9 Nov 2010 18:15:31 +0000\r
+Message-Id: <1289326531-27252-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.2.3\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: Tue, 09 Nov 2010 18:17:02 -0000\r
+\r
+---\r
+ emacs/notmuch-wash.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 26a3f88..cfcfb21 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -145,7 +145,7 @@ is what to put on the button."\r
+          (re-search-forward notmuch-wash-signature-regexp nil t))\r
+       (let* ((sig-start (match-beginning 0))\r
+            (sig-end (match-end 0))\r
+-           (sig-lines (1- (count-lines sig-start (point-max)))))\r
++           (sig-lines (count-lines sig-start (point-max))))\r
+       (if (<= sig-lines notmuch-wash-signature-lines-max)\r
+           (let ((sig-start-marker (make-marker))\r
+                 (sig-end-marker (make-marker)))\r
+-- \r
+1.7.2.3\r
+\r