[PATCH v2 01/11] test: fix compact backup / restore test
[notmuch-archives.git] / f9 / cfac3c57ee158f6b61d33b5e90e91fa376a18b
1 Return-Path: <markwalters1009@gmail.com>\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 8C872429E5B\r
6         for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:20:07 -0800 (PST)\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
8 X-Spam-Flag: NO\r
9 X-Spam-Score: 0.201\r
10 X-Spam-Level: \r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
15 Received: from olra.theworths.org ([127.0.0.1])\r
16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
17         with ESMTP id WFi0bRZf4Z71 for <notmuch@notmuchmail.org>;\r
18         Sun, 12 Feb 2012 17:20:06 -0800 (PST)\r
19 Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
20  [74.125.82.45])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
22  A975441ED83    for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:32 -0800\r
23  (PST)\r
24 Received: by mail-ww0-f45.google.com with SMTP id dt12so3923384wgb.2\r
25         for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:32 -0800 (PST)\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
28         bh=W4Fab4EQaJjjhsFtFXzc/YfZvjj+K88DRcNt//OZfxw=;\r
29         b=FoliJ2WFrC+ZQsT0ftzqtQH5GkID9t7OALIl2HdX745JQPexAf1kvoEY2vdrTavijn\r
30         9T7OP+BPmtRv8dhqE4GOGTcwc6lqMuPMt9kOwRJQLJikBznyzpzkjNqJpW3aXRW1hAt8\r
31         rASqcAY47907k7IYTqFY++/SEXRizh0pILblQ=\r
32 Received: by 10.180.101.200 with SMTP id fi8mr21162785wib.20.1329095972430;\r
33         Sun, 12 Feb 2012 17:19:32 -0800 (PST)\r
34 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
35  [94.192.233.223])      by mx.google.com with ESMTPS id\r
36  dw7sm18425321wib.4.2012.02.12.17.19.31 (version=TLSv1/SSLv3 cipher=OTHER);\r
37         Sun, 12 Feb 2012 17:19:31 -0800 (PST)\r
38 From: Mark Walters <markwalters1009@gmail.com>\r
39 To: notmuch@notmuchmail.org\r
40 Subject: [RFC PATCH v3 09/11] emacs: make notmuch-show return its buffer\r
41 Date: Mon, 13 Feb 2012 01:20:13 +0000\r
42 Message-Id: <1329096015-8078-10-git-send-email-markwalters1009@gmail.com>\r
43 X-Mailer: git-send-email 1.7.2.3\r
44 In-Reply-To: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
45 References: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
46 X-BeenThere: notmuch@notmuchmail.org\r
47 X-Mailman-Version: 2.1.13\r
48 Precedence: list\r
49 List-Id: "Use and development of the notmuch mail system."\r
50         <notmuch.notmuchmail.org>\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
52         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
54 List-Post: <mailto:notmuch@notmuchmail.org>\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
57         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
58 X-List-Received-Date: Mon, 13 Feb 2012 01:20:08 -0000\r
59 \r
60 notmuch-pick uses the returned buffer to try and make sure it does not\r
61 close the wrong buffer.\r
62 ---\r
63  emacs/notmuch-show.el |    3 ++-\r
64  1 files changed, 2 insertions(+), 1 deletions(-)\r
65 \r
66 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
67 index 244e18d..8a8acf6 100644\r
68 --- a/emacs/notmuch-show.el\r
69 +++ b/emacs/notmuch-show.el\r
70 @@ -1048,7 +1048,8 @@ function is used."\r
71      (setq notmuch-show-thread-id thread-id\r
72           notmuch-show-parent-buffer parent-buffer\r
73           notmuch-show-query-context query-context)\r
74 -    (notmuch-show-worker)))\r
75 +    (notmuch-show-worker)\r
76 +    (current-buffer)))\r
77  \r
78  (defun notmuch-show-worker ()\r
79    (let ((inhibit-read-only t))\r
80 -- \r
81 1.7.2.3\r
82 \r