[PATCH 3/5] contrib: pick: bugfix: make the right variable buffer-local

diff --git a/0a/c226e90249be5ce52b163670ee07519b2f2f65 b/0a/c226e90249be5ce52b163670ee07519b2f2f65
new file mode 100644 (file)
index 0000000..21de31c
--- /dev/null
+++ b/0a/c226e90249be5ce52b163670ee07519b2f2f65
@@ -0,0 +1,89 @@
+Return-Path: <markwalters1009@gmail.com>\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 EEEFD429E3D\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Jul 2013 00:54:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 KSQv7QSs6zVg for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Jul 2013 00:54:17 -0700 (PDT)\r
+Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com\r
+ [74.125.82.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 7BA7B429E2F   for <notmuch@notmuchmail.org>; Mon,  1 Jul 2013 00:54:14 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f51.google.com with SMTP id e11so3376206wgh.6\r
+       for <notmuch@notmuchmail.org>; Mon, 01 Jul 2013 00:54:13 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=/aeQn0EFtw5lYwHpJQUlci/7Yip+iT/J9K6y1PAPYow=;\r
+       b=F0cBN34hMXYizvszyRLYvsIB1FdmoZCtUDU/hQizFbBeiFXa/QxnHo2a0hEu74/n40\r
+       ZnHrUG0j5SZKdGySUz+L4mHfugHACI3H68wl61P3Yob8bWrgxAz1JZQNmzV1zbImAkoo\r
+       Z2l09asfRoLg2Dw1bLFRE7ALspmvN0KzY7g7jaL26ZStARLg9IgONPguoZX9Irv2TVTS\r
+       3wDCfeDUPuhRU+Zwuqc/b475umkxX1dLfFUf0fuDItF0pmxUz5I6OtZb/jU5oip+jkh9\r
+       cGy0BxcjwBV+ciOR3g6ctqcqimm2yOMGu+j9uEVmlbzshfU1mOhGXrw5vguAd/f/Pckj\r
+       HErA==\r
+X-Received: by 10.180.91.107 with SMTP id cd11mr11208858wib.12.1372665253412; \r
+       Mon, 01 Jul 2013 00:54:13 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id p1sm14445576wix.9.2013.07.01.00.54.12\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 01 Jul 2013 00:54:13 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/5] contrib: pick: bugfix: make the right variable\r
+       buffer-local\r
+Date: Mon,  1 Jul 2013 08:54:01 +0100\r
+Message-Id: <1372665243-7675-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1372665243-7675-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1372665243-7675-1-git-send-email-markwalters1009@gmail.com>\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: Mon, 01 Jul 2013 07:54:24 -0000\r
+\r
+The variable notmuch-pick-message-buffer should be buffer local but\r
+instead notmuch-pick-message-buffer-name (a non-existent variable) was\r
+made buffer local.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index cce3cb7..2981508 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -184,8 +184,8 @@ the child show buffer.")\r
+ \r
+ This is used to try and make sure we don't close the message pane\r
+ if the user has loaded a different buffer in that window.")\r
+-(make-variable-buffer-local 'notmuch-pick-message-buffer-name)\r
+-(put 'notmuch-pick-message-buffer-name 'permanent-local t)\r
++(make-variable-buffer-local 'notmuch-pick-message-buffer)\r
++(put 'notmuch-pick-message-buffer 'permanent-local t)\r
+ \r
+ (defvar notmuch-pick-process-state nil\r
+   "Parsing state of the search process filter.")\r
+-- \r
+1.7.9.1\r
+\r