From 99296f4f7e1bd3813cf805866845357c737d489e Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 1 Nov 2013 09:23:43 +0000 Subject: [PATCH] [PATCH v2 9/11] emacs: move search based tree functions to notmuch.el --- 11/d06c7e8ecd3efe2aec77ccd01a8e49826abc22 | 128 ++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 11/d06c7e8ecd3efe2aec77ccd01a8e49826abc22 diff --git a/11/d06c7e8ecd3efe2aec77ccd01a8e49826abc22 b/11/d06c7e8ecd3efe2aec77ccd01a8e49826abc22 new file mode 100644 index 000000000..60d872550 --- /dev/null +++ b/11/d06c7e8ecd3efe2aec77ccd01a8e49826abc22 @@ -0,0 +1,128 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 185D4429E28 + for ; Fri, 1 Nov 2013 02:24:15 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id sfXiQVCSAcIL for ; + Fri, 1 Nov 2013 02:24:10 -0700 (PDT) +Received: from mail-we0-f170.google.com (mail-we0-f170.google.com + [74.125.82.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 49080431FC9 + for ; Fri, 1 Nov 2013 02:24:06 -0700 (PDT) +Received: by mail-we0-f170.google.com with SMTP id u57so3759279wes.15 + for ; Fri, 01 Nov 2013 02:24:05 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=nJh0UWR79KCRZjHzzVskA/jaJ8jILtEnM6aPyyFvulE=; + b=obCIXlDqoO1LnGD8aFB6ctGwoTOiyHqUOKxOZNlrZMKWF/+alqRGstK8gTjYzxI8mn + IVGV0CIRR46RpfzU9CCYtrAyoCxSgAvUReIAI3jq/DgXL+PRCby7/o06VpRhONcReEKi + DIGWD4XakXI9/M3FXjZLdqeIGWMZArIO1iyXWvjPd1WsR6c6swfkfvw8ppu3cqMSnUcH + JeFKRcsRb+se8VxS8ELNrOt5Go6NXHd1P/ZsOFlm5xhX3kQB3Wns7efl6sCTLhWq3vLM + p1OW6ja1HDWMF9TfcTPyMRXNNwb8hZzEjux6Y2FXFWKsLVNOhjfEalh7Z5SDjD1GZBGG + dasw== +X-Received: by 10.180.95.202 with SMTP id dm10mr1510116wib.62.1383297845150; + Fri, 01 Nov 2013 02:24:05 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id e1sm4529756wij.6.2013.11.01.02.24.04 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 01 Nov 2013 02:24:04 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 9/11] emacs: move search based tree functions to notmuch.el +Date: Fri, 1 Nov 2013 09:23:43 +0000 +Message-Id: <1383297825-12326-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1383297825-12326-1-git-send-email-markwalters1009@gmail.com> +References: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com> + <1383297825-12326-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 01 Nov 2013 09:24:15 -0000 + +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 ebfb5e7..78b4a57 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 418c781..2c9a07c 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") +-- +1.7.9.1 + -- 2.26.2