3a/114b53b0b85c622c18e0cb5b6bad74cb744b8e

   1 Return-Path: <markwalters1009@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 3E78D431FD6\r
   6         for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 13:15:28 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id Lyn2H7yN-CVx for <notmuch@notmuchmail.org>;\r
  18         Mon,  2 Sep 2013 13:15:22 -0700 (PDT)\r
  19 Received: from mail-we0-f169.google.com (mail-we0-f169.google.com\r
  20         [74.125.82.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id D26B9431FCB\r
  23         for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 13:15:21 -0700 (PDT)\r
  24 Received: by mail-we0-f169.google.com with SMTP id t60so830676wes.28\r
  25         for <notmuch@notmuchmail.org>; Mon, 02 Sep 2013 13:15:20 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  28         bh=vqrz/yQXi0ullr1bYRNIrYdLiZbLXx9fSdItbfvIDWc=;\r
  29         b=DMh3iXFtzDXkj+dMTsPGY5bsFBaMzGCNTwjfGdVnbXL0DywFCilLLPUohNWObv0WTO\r
  30         ciI4tUoZTXkgTNWK/n1XhpHsXJsTJo0scXbZNMxq6/CptuU7peEkO9eMeDpnluglj76c\r
  31         wXyyBU+VWIrcvzNl+lH7Zw9kbT13yvKttTckxtBkfk6e8QuAjbNskXGHGDz72IHS6/dI\r
  32         UrIZOSksU7ynC7Qfi2rBoq/wkW0qCvo+NCYKPHuX669fJUWJXaHh6c+dMkR7NKX8MJJ1\r
  33         U3b7PADasdyZwYnzgUx3ZGxPVx9eFHkcT3XeDHtVbv4bT7KKVKFmhlPlxKckSnj+s9ok\r
  34         45gA==\r
  35 X-Received: by 10.180.206.9 with SMTP id lk9mr15132381wic.26.1378152920771;\r
  36         Mon, 02 Sep 2013 13:15:20 -0700 (PDT)\r
  37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
  38         by mx.google.com with ESMTPSA id\r
  39         dr11sm20835614wid.3.1969.12.31.16.00.00\r
  40         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  41         Mon, 02 Sep 2013 13:15:20 -0700 (PDT)\r
  42 From: Mark Walters <markwalters1009@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [Patch v3 1/3] contrib: pick: remove unneeded variable\r
  45         notmuch-pick-buffer-name\r
  46 Date: Mon,  2 Sep 2013 21:15:12 +0100\r
  47 Message-Id: <1378152914-18930-2-git-send-email-markwalters1009@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.9.1\r
  49 In-Reply-To: <1378152914-18930-1-git-send-email-markwalters1009@gmail.com>\r
  50 References: <1378152914-18930-1-git-send-email-markwalters1009@gmail.com>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Mon, 02 Sep 2013 20:15:28 -0000\r
  64 \r
  65 This variable is essentially unused: it was only used for making sure\r
  66 it itself got reset after a refresh of the buffer.\r
  67 \r
  68 It did this by passing an unnecessary argument to notmuch-pick-worker\r
  69 so remove that too.\r
  70 ---\r
  71  contrib/notmuch-pick/notmuch-pick.el |   25 +++++++++----------------\r
  72  1 files changed, 9 insertions(+), 16 deletions(-)\r
  73 \r
  74 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
  75 index f7caaa8..32bd6b5 100644\r
  76 --- a/contrib/notmuch-pick/notmuch-pick.el\r
  77 +++ b/contrib/notmuch-pick/notmuch-pick.el\r
  78 @@ -161,10 +161,6 @@\r
  79    "A buffer local copy of argument open-target to the function notmuch-pick")\r
  80  (make-variable-buffer-local 'notmuch-pick-open-target)\r
  81  \r
  82 -(defvar notmuch-pick-buffer-name nil\r
  83 -  "A buffer local copy of argument buffer-name to the function notmuch-pick")\r
  84 -(make-variable-buffer-local 'notmuch-pick-buffer-name)\r
  85 -\r
  86  (defvar notmuch-pick-message-window nil\r
  87    "The window of the message pane.\r
  88  \r
  89 @@ -590,13 +586,11 @@ message will be \"unarchived\", i.e. the tag changes in\r
  90    (let ((inhibit-read-only t)\r
  91         (basic-query notmuch-pick-basic-query)\r
  92         (query-context notmuch-pick-query-context)\r
  93 -       (target (notmuch-pick-get-message-id))\r
  94 -       (buffer-name notmuch-pick-buffer-name))\r
  95 +       (target (notmuch-pick-get-message-id)))\r
  96      (erase-buffer)\r
  97      (notmuch-pick-worker basic-query\r
  98                          query-context\r
  99 -                        target\r
 100 -                        (get-buffer buffer-name))))\r
 101 +                        target)))\r
 102  \r
 103  (defun notmuch-pick-thread-top ()\r
 104    (when (notmuch-pick-get-message-properties)\r
 105 @@ -859,12 +853,11 @@ Complete list of currently available key bindings:\r
 106         (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread\r
 107                                          results-buf)))))\r
 108  \r
 109 -(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target)\r
 110 +(defun notmuch-pick-worker (basic-query &optional query-context target open-target)\r
 111    (interactive)\r
 112    (notmuch-pick-mode)\r
 113    (setq notmuch-pick-basic-query basic-query)\r
 114    (setq notmuch-pick-query-context query-context)\r
 115 -  (setq notmuch-pick-buffer-name (buffer-name buffer))\r
 116    (setq notmuch-pick-target-msg target)\r
 117    (setq notmuch-pick-open-target open-target)\r
 118  \r
 119 @@ -877,7 +870,7 @@ Complete list of currently available key bindings:\r
 120      (if (equal (car (process-lines notmuch-command "count" search-args)) "0")\r
 121         (setq search-args basic-query))\r
 122      (let ((proc (notmuch-start-notmuch\r
 123 -                "notmuch-pick" buffer #'notmuch-pick-process-sentinel\r
 124 +                "notmuch-pick" (current-buffer) #'notmuch-pick-process-sentinel\r
 125                  "show" "--body=false" "--format=sexp"\r
 126                  message-arg search-args))\r
 127           ;; Use a scratch buffer to accumulate partial output.\r
 128 @@ -910,13 +903,13 @@ The arguments are:\r
 129                                         (concat "*notmuch-pick-" query "*")))))\r
 130         (inhibit-read-only t))\r
 131  \r
 132 -    (switch-to-buffer buffer)\r
 133 -    ;; Don't track undo information for this buffer\r
 134 -    (set 'buffer-undo-list t)\r
 135 +    (switch-to-buffer buffer))\r
 136 +  ;; Don't track undo information for this buffer\r
 137 +  (set 'buffer-undo-list t)\r
 138  \r
 139 -    (notmuch-pick-worker query query-context target buffer open-target)\r
 140 +  (notmuch-pick-worker query query-context target open-target)\r
 141  \r
 142 -    (setq truncate-lines t)))\r
 143 +  (setq truncate-lines t))\r
 144  \r
 145  \r
 146  ;; Set up key bindings from the rest of notmuch.\r
 147 -- \r
 148 1.7.9.1\r
 149 \r