From: Mark Walters Date: Sun, 25 Aug 2013 19:50:13 +0000 (+0100) Subject: [Patch (rebased) 1/2] contrib: pick: remove unneeded variable notmuch-pick-buffer... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d54b16132fc2039bc3e28abd3b678fec8deb616a;p=notmuch-archives.git [Patch (rebased) 1/2] contrib: pick: remove unneeded variable notmuch-pick-buffer-name --- diff --git a/85/184626755d1161d56b1b5c66f31c103f13d3d2 b/85/184626755d1161d56b1b5c66f31c103f13d3d2 new file mode 100644 index 000000000..7f6b719da --- /dev/null +++ b/85/184626755d1161d56b1b5c66f31c103f13d3d2 @@ -0,0 +1,129 @@ +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 EBAC2431FCF + for ; Mon, 26 Aug 2013 10:16:15 -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 pWuhKPz3ovVy for ; + Mon, 26 Aug 2013 10:16:09 -0700 (PDT) +Received: from mail-we0-f182.google.com (mail-we0-f182.google.com + [74.125.82.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3F027431FC0 + for ; Mon, 26 Aug 2013 10:16:09 -0700 (PDT) +Received: by mail-we0-f182.google.com with SMTP id q59so3031342wes.27 + for ; Mon, 26 Aug 2013 10:16:08 -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:in-reply-to:references; + bh=wvAhD6O21SbuduYd5SGfetTnuWfj3M3DJSDRn0uZpVQ=; + b=CutRqDMrdyH5BlEV5VIuv3yvV3tciy+Su1fzZM8dqjxD7QmHJ678URbJPH2kjGCnsq + AzjMmXJZLWZ2PJwapxfpWnqJdGPWIbSleqVODRBkO7WrSbVvr4LkY9yBqUbkbaOocPB7 + veGOlnCBJyG2f4W2IiHU/4MxNqxG/p76gig0NTA68gKW8D9xH6iRVg/IENp/patNnrHF + ly4sS3uFoaIxQXDa7TOFBwCF/5y3P9tsRj+ZCsnqqryAyHMxue8TdYU4AblNzwEGe5eA + QHygpHEApTsnTSUfK19VhcSKn8FG9BGwNGU+fuvd/uR7dIiqIaeAngxwmvR6OWXyF5QN + vcOA== +X-Received: by 10.180.84.196 with SMTP id b4mr5176208wiz.19.1377460220392; + Sun, 25 Aug 2013 12:50:20 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id pn7sm8186979wic.6.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 25 Aug 2013 12:50:19 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch (rebased) 1/2] contrib: pick: remove unneeded variable + notmuch-pick-buffer-name +Date: Sun, 25 Aug 2013 20:50:13 +0100 +Message-Id: <1377460214-4795-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1377460214-4795-1-git-send-email-markwalters1009@gmail.com> +References: <1377460214-4795-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, 26 Aug 2013 17:16:16 -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 37dc161..f6710e9 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. + +@@ -591,13 +587,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))) + + (defun notmuch-pick-clean-address (address) + "Try to clean a single email ADDRESS for display. Return +@@ -800,12 +794,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 +