1 Return-Path: <dme@dme.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1D95B431FAE
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 23:19:49 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id r-41XoHZ6VjN for <notmuch@notmuchmail.org>;
\r
16 Wed, 25 Jan 2012 23:19:48 -0800 (PST)
\r
17 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
18 [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 56EAD431FBC
\r
21 for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 23:19:47 -0800 (PST)
\r
22 Received: by wibhi8 with SMTP id hi8so181668wib.26
\r
23 for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 23:19:44 -0800 (PST)
\r
24 Received: by 10.180.84.105 with SMTP id x9mr2013911wiy.19.1327562384856;
\r
25 Wed, 25 Jan 2012 23:19:44 -0800 (PST)
\r
26 Received: from hotblack-desiato.hh.sledj.net
\r
27 (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])
\r
28 by mx.google.com with ESMTPS id m8sm9542109wia.11.2012.01.25.23.19.42
\r
29 (version=TLSv1/SSLv3 cipher=OTHER);
\r
30 Wed, 25 Jan 2012 23:19:43 -0800 (PST)
\r
31 Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)
\r
32 id 85E5C9FEEC; Thu, 26 Jan 2012 07:19:41 +0000 (GMT)
\r
33 From: David Edmondson <dme@dme.org>
\r
34 To: notmuch@notmuchmail.org
\r
35 Subject: [PATCH 2/4 v3] test: `notmuch-test-run' should protect against buffer
\r
37 Date: Thu, 26 Jan 2012 07:19:38 +0000
\r
38 Message-Id: <1327562380-12894-3-git-send-email-dme@dme.org>
\r
39 X-Mailer: git-send-email 1.7.8.3
\r
40 In-Reply-To: <1327562380-12894-1-git-send-email-dme@dme.org>
\r
41 References: <1327503908-17226-1-git-send-email-dme@dme.org>
\r
42 <1327562380-12894-1-git-send-email-dme@dme.org>
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Thu, 26 Jan 2012 07:19:49 -0000
\r
57 The body of the test may cause the current buffer to change. Ensure
\r
58 that the output goes to the correct buffer by switching back before
\r
61 test/test-lib.el | 4 +++-
\r
62 1 files changed, 3 insertions(+), 1 deletions(-)
\r
64 diff --git a/test/test-lib.el b/test/test-lib.el
\r
65 index 5b32e0a..6271da2 100644
\r
66 --- a/test/test-lib.el
\r
67 +++ b/test/test-lib.el
\r
68 @@ -92,7 +92,9 @@ nothing."
\r
69 (defmacro notmuch-test-run (&rest body)
\r
70 "Evaluate a BODY of test expressions and output the result."
\r
72 - (let ((result (progn ,@body)))
\r
73 + (let ((buffer (current-buffer))
\r
74 + (result (progn ,@body)))
\r
75 + (switch-to-buffer buffer)
\r
76 (insert (if (stringp result)
\r
78 (prin1-to-string result)))
\r