[Patch v2 1/3] contrib: pick: remove unneeded variable notmuch-pick-buffer-name

diff --git a/c0/3a91e9819b9fb63b481f960c9e0b14695b581d b/c0/3a91e9819b9fb63b481f960c9e0b14695b581d
new file mode 100644 (file)
index 0000000..17b5e6d
--- /dev/null
+++ b/c0/3a91e9819b9fb63b481f960c9e0b14695b581d
@@ -0,0 +1,148 @@
+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 3C12A431FD8\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 14:09:22 -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 mAwtSCfFLTLY for <notmuch@notmuchmail.org>;\r
+       Mon, 26 Aug 2013 14:09:16 -0700 (PDT)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+       [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6AB80431FD4\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 14:09:16 -0700 (PDT)\r
+Received: by mail-wi0-f180.google.com with SMTP id l12so3066081wiv.1\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 14:09:14 -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:in-reply-to:references;\r
+       bh=4/KVWjghkP1o4+H62pV4xwv+tUq25NfJuJcFF3dBPrk=;\r
+       b=xx04wwwC9WNON0QBvD2gikUdu+Ssrjb85HE1DKWHcY++mN+1ILPLgJylXu0dQAc5GE\r
+       VFXatEOKpG6ZVQ8a+tCHdUOcUZN73ombN7/R8We7VAojp3SDZ5CHxVafeWUz+IIGpIjq\r
+       IRnF+nSc4Kc2eqiLaspWET4jkWfYNzlSlEvo1guI6/XxceVUbPYjkBQpK7OBSRnANZBw\r
+       ubQhp6Q/sxWqPIOBXLwIAFElz3S890/khP4UgsEjyrxx0CXwCevj70C1Z3YnCT92sYeh\r
+       5DBzzpt4g4MqdK/t8r5O32+Ty3fm/cCvmzoAwTfx2BAu/LWIIazHSC6VwQcZaPSm1TjX\r
+       NUCA==\r
+X-Received: by 10.194.170.227 with SMTP id ap3mr3161358wjc.40.1377551354002;\r
+       Mon, 26 Aug 2013 14:09:14 -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 z2sm21384090wiv.11.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 26 Aug 2013 14:09:13 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 1/3] contrib: pick: remove unneeded variable\r
+       notmuch-pick-buffer-name\r
+Date: Mon, 26 Aug 2013 22:09:03 +0100\r
+Message-Id: <1377551345-27147-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1377551345-27147-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1377551345-27147-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, 26 Aug 2013 21:09:22 -0000\r
+\r
+This variable is essentially unused: it was only used for making sure\r
+it itself got reset after a refresh of the buffer.\r
+\r
+It did this by passing an unnecessary argument to notmuch-pick-worker\r
+so remove that too.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |   25 +++++++++----------------\r
+ 1 files changed, 9 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 8c499b0..5943ac2 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -161,10 +161,6 @@\r
+   "A buffer local copy of argument open-target to the function notmuch-pick")\r
+ (make-variable-buffer-local 'notmuch-pick-open-target)\r
+ \r
+-(defvar notmuch-pick-buffer-name nil\r
+-  "A buffer local copy of argument buffer-name to the function notmuch-pick")\r
+-(make-variable-buffer-local 'notmuch-pick-buffer-name)\r
+-\r
+ (defvar notmuch-pick-message-window nil\r
+   "The window of the message pane.\r
+ \r
+@@ -586,13 +582,11 @@ message will be \"unarchived\", i.e. the tag changes in\r
+   (let ((inhibit-read-only t)\r
+       (basic-query notmuch-pick-basic-query)\r
+       (query-context notmuch-pick-query-context)\r
+-      (target (notmuch-pick-get-message-id))\r
+-      (buffer-name notmuch-pick-buffer-name))\r
++      (target (notmuch-pick-get-message-id)))\r
+     (erase-buffer)\r
+     (notmuch-pick-worker basic-query\r
+                        query-context\r
+-                       target\r
+-                       (get-buffer buffer-name))))\r
++                       target)))\r
+ \r
+ (defun notmuch-pick-clean-address (address)\r
+   "Try to clean a single email ADDRESS for display. Return\r
+@@ -795,12 +789,11 @@ Complete list of currently available key bindings:\r
+       (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread\r
+                                        results-buf)))))\r
+ \r
+-(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target)\r
++(defun notmuch-pick-worker (basic-query &optional query-context target open-target)\r
+   (interactive)\r
+   (notmuch-pick-mode)\r
+   (setq notmuch-pick-basic-query basic-query)\r
+   (setq notmuch-pick-query-context query-context)\r
+-  (setq notmuch-pick-buffer-name (buffer-name buffer))\r
+   (setq notmuch-pick-target-msg target)\r
+   (setq notmuch-pick-open-target open-target)\r
+ \r
+@@ -813,7 +806,7 @@ Complete list of currently available key bindings:\r
+     (if (equal (car (process-lines notmuch-command "count" search-args)) "0")\r
+       (setq search-args basic-query))\r
+     (let ((proc (notmuch-start-notmuch\r
+-               "notmuch-pick" buffer #'notmuch-pick-process-sentinel\r
++               "notmuch-pick" (current-buffer) #'notmuch-pick-process-sentinel\r
+                "show" "--body=false" "--format=sexp"\r
+                message-arg search-args))\r
+         ;; Use a scratch buffer to accumulate partial output.\r
+@@ -846,13 +839,13 @@ The arguments are:\r
+                                       (concat "*notmuch-pick-" query "*")))))\r
+       (inhibit-read-only t))\r
+ \r
+-    (switch-to-buffer buffer)\r
+-    ;; Don't track undo information for this buffer\r
+-    (set 'buffer-undo-list t)\r
++    (switch-to-buffer buffer))\r
++  ;; Don't track undo information for this buffer\r
++  (set 'buffer-undo-list t)\r
+ \r
+-    (notmuch-pick-worker query query-context target buffer open-target)\r
++  (notmuch-pick-worker query query-context target open-target)\r
+ \r
+-    (setq truncate-lines t)))\r
++  (setq truncate-lines t))\r
+ \r
+ \r
+ ;; Set up key bindings from the rest of notmuch.\r
+-- \r
+1.7.9.1\r
+\r