From 00b3ee4f82ed94125f6789ba7bdd88b98ed248ef Mon Sep 17 00:00:00 2001
From: Mark Walters <markwalters1009@gmail.com>
Date: Fri, 1 Nov 2013 09:23:43 +0000
Subject: [PATCH] emacs: move search based tree functions to notmuch.el

Move a couple of the search mode specifc caller helpers for tree from
tree into notmuch.el.
---
 emacs/notmuch-tree.el | 18 ------------------
 emacs/notmuch.el      | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index ebfb5e7b..78b4a57e 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -413,24 +413,6 @@ Does NOT change the database."
 		notmuch-show-query-context
 		(notmuch-show-get-message-id)))
 
-;; This function should be in notmuch.el but be we trying to minimise
-;; impact on the rest of the codebase.
-(defun notmuch-tree-from-search-current-query ()
-  "Call notmuch tree with the current query"
-  (interactive)
-  (notmuch-tree notmuch-search-query-string))
-
-;; This function should be in notmuch.el but be we trying to minimise
-;; impact on the rest of the codebase.
-(defun notmuch-tree-from-search-thread ()
-  "Show the selected thread with notmuch-tree"
-  (interactive)
-  (notmuch-tree (notmuch-search-find-thread-id)
-                notmuch-search-query-string
-		nil
-                (notmuch-prettify-subject (notmuch-search-find-subject))
-		t))
-
 (defun notmuch-tree-message-window-kill-hook ()
   "Close the message pane when exiting the show buffer."
   (let ((buffer (current-buffer)))
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 418c7812..2c9a07c1 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -439,6 +439,20 @@ If BARE is set then do not prefix with \"thread:\""
 		      (concat "*" (truncate-string-to-width subject 30 nil nil t) "*"))
       (message "End of search results."))))
 
+(defun notmuch-tree-from-search-current-query ()
+  "Call notmuch tree with the current query"
+  (interactive)
+  (notmuch-tree notmuch-search-query-string))
+
+(defun notmuch-tree-from-search-thread ()
+  "Show the selected thread with notmuch-tree"
+  (interactive)
+  (notmuch-tree (notmuch-search-find-thread-id)
+                notmuch-search-query-string
+		nil
+                (notmuch-prettify-subject (notmuch-search-find-subject))
+		t))
+
 (defun notmuch-search-reply-to-thread (&optional prompt-for-sender)
   "Begin composing a reply-all to the entire current thread in a new buffer."
   (interactive "P")
-- 
2.26.2