[PATCH 02/11] emacs: tree: remove unneeded declarations

diff --git a/c2/1b3a77f16f77210d4e95a7a536642ee0ac9861 b/c2/1b3a77f16f77210d4e95a7a536642ee0ac9861
new file mode 100644 (file)
index 0000000..5a452b2
--- /dev/null
+++ b/c2/1b3a77f16f77210d4e95a7a536642ee0ac9861
@@ -0,0 +1,102 @@
+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 46D72431FD7\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 15:55:55 -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 WCGJR7Ftb3XS for <notmuch@notmuchmail.org>;\r
+       Tue, 29 Oct 2013 15:55:49 -0700 (PDT)\r
+Received: from mail-we0-f176.google.com (mail-we0-f176.google.com\r
+       [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9BAAF431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 15:55:49 -0700 (PDT)\r
+Received: by mail-we0-f176.google.com with SMTP id w62so536061wes.21\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 15:55:47 -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=1DeehcNjoK+tQAW7ueuyEyaYrbBExLhB2wfrxDcxqEs=;\r
+       b=s95cjDLB8gwUSinmF6VW7nVwfEQesR1ELE2x4//RJQA9BB6FhO+qiahUsXj6c+en27\r
+       BmNo5euJTSSBRlWM1bthfTa53Ijj4O34y7yKY5RLwqf0OwI+f8K/B/GdH4VdHL1hguxL\r
+       hsFQFBfgDJUKqcjA38W6p6PAYhFXhKmhQLqaxlOQAs+TwgyDrNP3/hsAnQ/rTpqjSzP7\r
+       z0TwggNjeEqDAPFkC5GZt1Gkw/erYogei65vRi2t0IMcdeSgGMNfVRfI0grBG6qQd+7N\r
+       g2yBuPcMoY1TgbjjBM0Teqpc4PxmY877MumGkX9kknkebvLv0jaA9TXOXWPwkiQaiLFQ\r
+       t/Ng==\r
+X-Received: by 10.194.219.1 with SMTP id pk1mr1788776wjc.36.1383087345942;\r
+       Tue, 29 Oct 2013 15:55:45 -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\r
+       by10sm9561930wib.10.2013.10.29.15.55.45 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 29 Oct 2013 15:55:45 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 02/11] emacs: tree: remove unneeded declarations\r
+Date: Tue, 29 Oct 2013 22:55:29 +0000\r
+Message-Id: <1383087338-10220-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383087338-10220-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: Tue, 29 Oct 2013 22:55:55 -0000\r
+\r
+There are some crufty declare-functions and requires in notmuch-tree:\r
+since it requires notmuch.el itself this all works but in preparation\r
+for the move to mainline tidy this up.\r
+---\r
+ contrib/notmuch-pick/notmuch-tree.el |   13 ++++---------\r
+ 1 files changed, 4 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-tree.el b/contrib/notmuch-pick/notmuch-tree.el\r
+index 512589f..d3330a0 100644\r
+--- a/contrib/notmuch-pick/notmuch-tree.el\r
++++ b/contrib/notmuch-pick/notmuch-tree.el\r
+@@ -27,20 +27,15 @@\r
+ (require 'notmuch-lib)\r
+ (require 'notmuch-query)\r
+ (require 'notmuch-show)\r
++(require 'notmuch-tag)\r
++(require 'notmuch-parser)\r
+ (require 'notmuch) ;; XXX ATM, as notmuch-search-mode-map is defined here\r
+ \r
+ (eval-when-compile (require 'cl))\r
+-\r
++(declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line))\r
+ (declare-function notmuch-call-notmuch-process "notmuch" (&rest args))\r
+-(declare-function notmuch-show "notmuch-show" (&rest args))\r
+-(declare-function notmuch-tag "notmuch" (query &rest tags))\r
+-(declare-function notmuch-show-strip-re "notmuch-show" (subject))\r
+-(declare-function notmuch-show-spaces-n "notmuch-show" (n))\r
+ (declare-function notmuch-read-query "notmuch" (prompt))\r
+-(declare-function notmuch-read-tag-changes "notmuch" (current-tags &optional prompt initial-input))\r
+-(declare-function notmuch-update-tags "notmuch" (current-tags tag-changes))\r
+-(declare-function notmuch-hello-trim "notmuch-hello" (search))\r
+-(declare-function notmuch-search-find-thread-id "notmuch" ())\r
++(declare-function notmuch-search-find-thread-id "notmuch" (&optional bare))\r
+ (declare-function notmuch-search-find-subject "notmuch" ())\r
+ \r
+ ;; the following variable is defined in notmuch.el\r
+-- \r
+1.7.9.1\r
+\r