From 304bd12e770eccd8cf73a6b4abe0f6d749553080 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Mon, 2 Sep 2013 21:15:12 +0100 Subject: [PATCH] [Patch v3 1/3] contrib: pick: remove unneeded variable notmuch-pick-buffer-name --- 3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e | 149 ++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e diff --git a/3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e b/3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e new file mode 100644 index 000000000..3237d6b77 --- /dev/null +++ b/3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e @@ -0,0 +1,149 @@ +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 3E78D431FD6 + for ; Mon, 2 Sep 2013 13:15:28 -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 Lyn2H7yN-CVx for ; + Mon, 2 Sep 2013 13:15:22 -0700 (PDT) +Received: from mail-we0-f169.google.com (mail-we0-f169.google.com + [74.125.82.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D26B9431FCB + for ; Mon, 2 Sep 2013 13:15:21 -0700 (PDT) +Received: by mail-we0-f169.google.com with SMTP id t60so830676wes.28 + for ; Mon, 02 Sep 2013 13:15:20 -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=vqrz/yQXi0ullr1bYRNIrYdLiZbLXx9fSdItbfvIDWc=; + b=DMh3iXFtzDXkj+dMTsPGY5bsFBaMzGCNTwjfGdVnbXL0DywFCilLLPUohNWObv0WTO + ciI4tUoZTXkgTNWK/n1XhpHsXJsTJo0scXbZNMxq6/CptuU7peEkO9eMeDpnluglj76c + wXyyBU+VWIrcvzNl+lH7Zw9kbT13yvKttTckxtBkfk6e8QuAjbNskXGHGDz72IHS6/dI + UrIZOSksU7ynC7Qfi2rBoq/wkW0qCvo+NCYKPHuX669fJUWJXaHh6c+dMkR7NKX8MJJ1 + U3b7PADasdyZwYnzgUx3ZGxPVx9eFHkcT3XeDHtVbv4bT7KKVKFmhlPlxKckSnj+s9ok + 45gA== +X-Received: by 10.180.206.9 with SMTP id lk9mr15132381wic.26.1378152920771; + Mon, 02 Sep 2013 13:15: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 + dr11sm20835614wid.3.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Mon, 02 Sep 2013 13:15:20 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v3 1/3] contrib: pick: remove unneeded variable + notmuch-pick-buffer-name +Date: Mon, 2 Sep 2013 21:15:12 +0100 +Message-Id: <1378152914-18930-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1378152914-18930-1-git-send-email-markwalters1009@gmail.com> +References: <1378152914-18930-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, 02 Sep 2013 20:15:28 -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 | 25 +++++++++---------------- + 1 files changed, 9 insertions(+), 16 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index f7caaa8..32bd6b5 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -161,10 +161,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. + +@@ -590,13 +586,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-thread-top () + (when (notmuch-pick-get-message-properties) +@@ -859,12 +853,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) + +@@ -877,7 +870,7 @@ Complete list of currently available key bindings: + (if (equal (car (process-lines notmuch-command "count" search-args)) "0") + (setq search-args basic-query)) + (let ((proc (notmuch-start-notmuch +- "notmuch-pick" buffer #'notmuch-pick-process-sentinel ++ "notmuch-pick" (current-buffer) #'notmuch-pick-process-sentinel + "show" "--body=false" "--format=sexp" + message-arg search-args)) + ;; Use a scratch buffer to accumulate partial output. +@@ -910,13 +903,13 @@ The arguments are: + (concat "*notmuch-pick-" query "*"))))) + (inhibit-read-only t)) + +- (switch-to-buffer buffer) +- ;; Don't track undo information for this buffer +- (set 'buffer-undo-list t) ++ (switch-to-buffer buffer)) ++ ;; 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))) ++ (setq truncate-lines t)) + + + ;; Set up key bindings from the rest of notmuch. +-- +1.7.9.1 + -- 2.26.2