[PATCH 2/3] test: fix hook-counter to accept the new no-display param

diff --git a/f5/fdee86bf2ff8616a622eae42726f2605193fb0 b/f5/fdee86bf2ff8616a622eae42726f2605193fb0
new file mode 100644 (file)
index 0000000..479c271
--- /dev/null
+++ b/f5/fdee86bf2ff8616a622eae42726f2605193fb0
@@ -0,0 +1,94 @@
+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 7170E431FC7\r
+       for <notmuch@notmuchmail.org>; Fri, 15 Jun 2012 08:53:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 I7S2gkessXQt for <notmuch@notmuchmail.org>;\r
+       Fri, 15 Jun 2012 08:53:53 -0700 (PDT)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 234FA431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 15 Jun 2012 08:53:52 -0700 (PDT)\r
+Received: by lbbgk8 with SMTP id gk8so3242305lbb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 15 Jun 2012 08:53:51 -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:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=7yl2aAYK1OIl/82/cjuZRGGHtvIaTXXoILZSV+/UUUA=;\r
+       b=ZGS1MaldfeF5XnxqPURMEKwSQB4tDdC/bSSbrzcFqBBXLOKx9V+21B+j96sNnc0i0g\r
+       NxP6Rc+5wZ3QrXCEEW9/7FLoMBCUD99Bk3RPOr61jec0THllHs4ssyrFIXbrWiZLlOxg\r
+       H/UPQW4W0E0DGpSRwlmN6yLEA07asbijOo5owYIHr9tCOaoI68TnT6A1/VWtTVMoLyVe\r
+       WfqchL3JRpD3Xj6vS3ItBFH5TeB4M1tdI+2d9Ku+S76bAKe8Kjfu99pOHjTtxNE9vSzM\r
+       tg3KZfPDSftryznDG+4JfUtzNFVMYqX0eaxsXgcRR3y/eezc5lltJBpocdzack7V4bMn\r
+       7U3g==\r
+Received: by 10.112.29.166 with SMTP id l6mr2807608lbh.68.1339775631587;\r
+       Fri, 15 Jun 2012 08:53:51 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
+       [80.220.80.68])\r
+       by mx.google.com with ESMTPS id hg4sm12969913lab.11.2012.06.15.08.53.49\r
+       (version=SSLv3 cipher=OTHER); Fri, 15 Jun 2012 08:53:50 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: fix hook-counter to accept the new no-display param\r
+Date: Fri, 15 Jun 2012 18:53:43 +0300\r
+Message-Id:\r
+ <04b277acfd9c74de89c745d2fa8a474d906b7102.1339775602.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To:\r
+ <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org>\r
+References:\r
+ <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org>\r
+In-Reply-To:\r
+ <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org>\r
+References:\r
+ <37899e28dbf67e4620a53279a869be3174c02d6f.1339775602.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlsMbZFq9CCtH6UfPpGtbWUlmVPnBbe5FEw9DwNgWF3SluzU8KLBpbn8Aa2t70cLM8sY1F9\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, 15 Jun 2012 15:53:56 -0000\r
+\r
+notmuch-hello-refresh-hook is now called with no-display param. Accept\r
+(and ignore) it in hook-counter.\r
+---\r
+ test/test-lib.el |    2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 6271da2..9f66b0e 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -74,7 +74,7 @@ running, quit if it terminated."\r
+       (kill-emacs)\r
+     (run-at-time "1 min" nil 'orphan-watchdog pid)))\r
+ \r
+-(defun hook-counter (hook)\r
++(defun hook-counter (hook &rest no-display)\r
+   "Count how many times a hook is called.  Increments\r
+ `hook'-counter variable value if it is bound, otherwise does\r
+ nothing."\r
+-- \r
+1.7.9.5\r
+\r