Re: folder and path completely broken in HEAD?
[notmuch-archives.git] / 85 / 184626755d1161d56b1b5c66f31c103f13d3d2
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 EBAC2431FCF\r
6         for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:16:15 -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 pWuhKPz3ovVy for <notmuch@notmuchmail.org>;\r
18         Mon, 26 Aug 2013 10:16:09 -0700 (PDT)\r
19 Received: from mail-we0-f182.google.com (mail-we0-f182.google.com\r
20         [74.125.82.182]) (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 3F027431FC0\r
23         for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:16:09 -0700 (PDT)\r
24 Received: by mail-we0-f182.google.com with SMTP id q59so3031342wes.27\r
25         for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:16:08 -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=wvAhD6O21SbuduYd5SGfetTnuWfj3M3DJSDRn0uZpVQ=;\r
29         b=CutRqDMrdyH5BlEV5VIuv3yvV3tciy+Su1fzZM8dqjxD7QmHJ678URbJPH2kjGCnsq\r
30         AzjMmXJZLWZ2PJwapxfpWnqJdGPWIbSleqVODRBkO7WrSbVvr4LkY9yBqUbkbaOocPB7\r
31         veGOlnCBJyG2f4W2IiHU/4MxNqxG/p76gig0NTA68gKW8D9xH6iRVg/IENp/patNnrHF\r
32         ly4sS3uFoaIxQXDa7TOFBwCF/5y3P9tsRj+ZCsnqqryAyHMxue8TdYU4AblNzwEGe5eA\r
33         QHygpHEApTsnTSUfK19VhcSKn8FG9BGwNGU+fuvd/uR7dIiqIaeAngxwmvR6OWXyF5QN\r
34         vcOA==\r
35 X-Received: by 10.180.84.196 with SMTP id b4mr5176208wiz.19.1377460220392;\r
36         Sun, 25 Aug 2013 12:50: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 pn7sm8186979wic.6.1969.12.31.16.00.00\r
39         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
40         Sun, 25 Aug 2013 12:50:19 -0700 (PDT)\r
41 From: Mark Walters <markwalters1009@gmail.com>\r
42 To: notmuch@notmuchmail.org\r
43 Subject: [Patch (rebased) 1/2] contrib: pick: remove unneeded variable\r
44         notmuch-pick-buffer-name\r
45 Date: Sun, 25 Aug 2013 20:50:13 +0100\r
46 Message-Id: <1377460214-4795-2-git-send-email-markwalters1009@gmail.com>\r
47 X-Mailer: git-send-email 1.7.9.1\r
48 In-Reply-To: <1377460214-4795-1-git-send-email-markwalters1009@gmail.com>\r
49 References: <1377460214-4795-1-git-send-email-markwalters1009@gmail.com>\r
50 X-BeenThere: notmuch@notmuchmail.org\r
51 X-Mailman-Version: 2.1.13\r
52 Precedence: list\r
53 List-Id: "Use and development of the notmuch mail system."\r
54         <notmuch.notmuchmail.org>\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
58 List-Post: <mailto:notmuch@notmuchmail.org>\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
62 X-List-Received-Date: Mon, 26 Aug 2013 17:16:16 -0000\r
63 \r
64 This variable is essentially unused: it was only used for making sure\r
65 it itself got reset after a refresh of the buffer.\r
66 \r
67 It did this by passing an unnecessary argument to notmuch-pick-worker\r
68 so remove that too.\r
69 ---\r
70  contrib/notmuch-pick/notmuch-pick.el |   15 ++++-----------\r
71  1 files changed, 4 insertions(+), 11 deletions(-)\r
72 \r
73 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
74 index 37dc161..f6710e9 100644\r
75 --- a/contrib/notmuch-pick/notmuch-pick.el\r
76 +++ b/contrib/notmuch-pick/notmuch-pick.el\r
77 @@ -166,10 +166,6 @@\r
78    "A buffer local copy of argument open-target to the function notmuch-pick")\r
79  (make-variable-buffer-local 'notmuch-pick-open-target)\r
80  \r
81 -(defvar notmuch-pick-buffer-name nil\r
82 -  "A buffer local copy of argument buffer-name to the function notmuch-pick")\r
83 -(make-variable-buffer-local 'notmuch-pick-buffer-name)\r
84 -\r
85  (defvar notmuch-pick-message-window nil\r
86    "The window of the message pane.\r
87  \r
88 @@ -591,13 +587,11 @@ message will be \"unarchived\", i.e. the tag changes in\r
89    (let ((inhibit-read-only t)\r
90         (basic-query notmuch-pick-basic-query)\r
91         (query-context notmuch-pick-query-context)\r
92 -       (target (notmuch-pick-get-message-id))\r
93 -       (buffer-name notmuch-pick-buffer-name))\r
94 +       (target (notmuch-pick-get-message-id)))\r
95      (erase-buffer)\r
96      (notmuch-pick-worker basic-query\r
97                          query-context\r
98 -                        target\r
99 -                        (get-buffer buffer-name))))\r
100 +                        target)))\r
101  \r
102  (defun notmuch-pick-clean-address (address)\r
103    "Try to clean a single email ADDRESS for display. Return\r
104 @@ -800,12 +794,11 @@ Complete list of currently available key bindings:\r
105         (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread\r
106                                          results-buf)))))\r
107  \r
108 -(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target)\r
109 +(defun notmuch-pick-worker (basic-query &optional query-context target open-target)\r
110    (interactive)\r
111    (notmuch-pick-mode)\r
112    (setq notmuch-pick-basic-query basic-query)\r
113    (setq notmuch-pick-query-context query-context)\r
114 -  (setq notmuch-pick-buffer-name (buffer-name buffer))\r
115    (setq notmuch-pick-target-msg target)\r
116    (setq notmuch-pick-open-target open-target)\r
117  \r
118 @@ -864,7 +857,7 @@ The arguments are:\r
119      ;; Don't track undo information for this buffer\r
120      (set 'buffer-undo-list t)\r
121  \r
122 -    (notmuch-pick-worker query query-context target buffer open-target)\r
123 +    (notmuch-pick-worker query query-context target open-target)\r
124  \r
125      (setq truncate-lines t)))\r
126  \r
127 -- \r
128 1.7.9.1\r
129 \r