From c372b1cf7c40ec639081af6c5229c1c8e7f351f3 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Mon, 1 Jul 2013 22:07:40 +0100 Subject: [PATCH] [PATCH 1/2] contrib: pick: remove unneeded variable notmuch-pick-buffer-name --- 74/ec96ce8378695c6ed20114eb75b47d9b8a377b | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 74/ec96ce8378695c6ed20114eb75b47d9b8a377b diff --git a/74/ec96ce8378695c6ed20114eb75b47d9b8a377b b/74/ec96ce8378695c6ed20114eb75b47d9b8a377b new file mode 100644 index 000000000..3012752c5 --- /dev/null +++ b/74/ec96ce8378695c6ed20114eb75b47d9b8a377b @@ -0,0 +1,130 @@ +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 2EC02429E2F + for ; Mon, 1 Jul 2013 14:07:56 -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 pJIBZ5PIMY2M for ; + Mon, 1 Jul 2013 14:07:48 -0700 (PDT) +Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com + [74.125.82.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 5BB33431FCF for ; Mon, 1 Jul 2013 14:07:48 -0700 + (PDT) +Received: by mail-wg0-f46.google.com with SMTP id c11so4078028wgh.1 + for ; Mon, 01 Jul 2013 14:07:47 -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=uxMHSMeBZOVR5cdFB77ntLQJ0xh77XxD9LtHj0stMcM=; + b=QHSwW4tUsMVjfokM04u/Sg7vUMv4XWhbPDugRgub27yYTV6pIuEZw1bTKo8XXGgprJ + DzKuVh4F4QuDyIe1aLAi5MYp/z9qGbK8KfQPhAw5OQppMr59c99V9XWS4pasVmkql1O3 + QZ7pHlX9HcxuJe9QiwkA8j2O8yk52+7R59q4j3ZMSNzEjePZDTNIe2m40mmnYf9TI3JQ + r2W5WnWU2seZ1X8QwEXwwOeIIdl2+hDfUvpx3V5YwQi7ExcVtjf1z+/0wqwIgGR3cMal + Roo05NwRw0H2tXn74OcfZmTt+NifLFwUkcd4subQ65N0gwFbimYhAiDuzryB77AbmJ7I + WTcw== +X-Received: by 10.194.249.69 with SMTP id ys5mr22272912wjc.39.1372712867286; + Mon, 01 Jul 2013 14:07:47 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id + fd3sm18842913wic.10.2013.07.01.14.07.46 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Mon, 01 Jul 2013 14:07:46 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] contrib: pick: remove unneeded variable + notmuch-pick-buffer-name +Date: Mon, 1 Jul 2013 22:07:40 +0100 +Message-Id: <1372712861-13515-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1372712861-13515-1-git-send-email-markwalters1009@gmail.com> +References: <1372712861-13515-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 21:07:56 -0000 + +This variable is essentially unused: it was only used for making sure +it itself got reset after a refresh of the buffer. + +It did this by passing an unnecessary argument to notmuch-pick-worker +so remove that too. +--- + contrib/notmuch-pick/notmuch-pick.el | 15 ++++----------- + 1 files changed, 4 insertions(+), 11 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index fbd7c0b..ce627db 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -166,10 +166,6 @@ + "A buffer local copy of argument open-target to the function notmuch-pick") + (make-variable-buffer-local 'notmuch-pick-open-target) + +-(defvar notmuch-pick-buffer-name nil +- "A buffer local copy of argument buffer-name to the function notmuch-pick") +-(make-variable-buffer-local 'notmuch-pick-buffer-name) +- + (defvar notmuch-pick-message-window nil + "The window of the message pane. + +@@ -527,13 +523,11 @@ message will be \"unarchived\", i.e. the tag changes in + (let ((inhibit-read-only t) + (basic-query notmuch-pick-basic-query) + (query-context notmuch-pick-query-context) +- (target (notmuch-pick-get-message-id)) +- (buffer-name notmuch-pick-buffer-name)) ++ (target (notmuch-pick-get-message-id))) + (erase-buffer) + (notmuch-pick-worker basic-query + query-context +- target +- (get-buffer buffer-name)))) ++ target))) + + (defmacro with-current-notmuch-pick-message (&rest body) + "Evaluate body with current buffer set to the text of current message" +@@ -799,12 +793,11 @@ Complete list of currently available key bindings: + (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread + results-buf))))) + +-(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target) ++(defun notmuch-pick-worker (basic-query &optional query-context target open-target) + (interactive) + (notmuch-pick-mode) + (setq notmuch-pick-basic-query basic-query) + (setq notmuch-pick-query-context query-context) +- (setq notmuch-pick-buffer-name (buffer-name buffer)) + (setq notmuch-pick-target-msg target) + (setq notmuch-pick-open-target open-target) + +@@ -864,7 +857,7 @@ The arguments are: + ;; Don't track undo information for this buffer + (set 'buffer-undo-list t) + +- (notmuch-pick-worker query query-context target buffer open-target) ++ (notmuch-pick-worker query query-context target open-target) + + (setq truncate-lines t))) + +-- +1.7.9.1 + -- 2.26.2