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