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 546C3431FC2
\r
6 for <notmuch@notmuchmail.org>; Fri, 1 Nov 2013 02:29:13 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 rUIA3snMpGQZ for <notmuch@notmuchmail.org>;
\r
18 Fri, 1 Nov 2013 02:29:06 -0700 (PDT)
\r
19 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com
\r
20 [209.85.212.176]) (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 90EC0431FBD
\r
23 for <notmuch@notmuchmail.org>; Fri, 1 Nov 2013 02:29:06 -0700 (PDT)
\r
24 Received: by mail-wi0-f176.google.com with SMTP id ex4so809297wid.15
\r
25 for <notmuch@notmuchmail.org>; Fri, 01 Nov 2013 02:29:05 -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=5U5K+MbMDh9Zt++PBAofGrzyVfISbKX1UqqHEQvxfGc=;
\r
29 b=Uf0yXMX5kNbMSg4U+2xebqN5+pnd+Z1MvUd9c30baSc09CHs6S5q+LExZw53LYnt0d
\r
30 AVXw2UOCzQsK4rxhhAG8+b02GQmQaYzrDUUQkMih+OdMlmKPt+/e4iLRBKSOszt3kwgz
\r
31 3v97taYOrjAcwVyOUZHo1VDC017qIyhGuNPyBFEzkOmc62subh2VU4DKIBW1u8utRap0
\r
32 Z4WWJH1+wRLZN9hyom4Vx6hvSQV8tIB6JlQg863eM3b9c4b4Br4WinatR8761scuAKxe
\r
33 0eZRudA0fVzDPBOpabIOb8BDcyzjnxwOJyWKSXCCLvKvnfAtLDq1kRntPez/vMUDpkxI
\r
35 X-Received: by 10.180.73.239 with SMTP id o15mr1726541wiv.36.1383297838393;
\r
36 Fri, 01 Nov 2013 02:23:58 -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 fr4sm4520825wib.0.2013.11.01.02.23.57
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 01 Nov 2013 02:23:58 -0700 (PDT)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v2 7/11] emacs: minimal change to load notmuch-tree by default
\r
45 Date: Fri, 1 Nov 2013 09:23:41 +0000
\r
46 Message-Id: <1383297825-12326-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1383297825-12326-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>
\r
50 <1383297825-12326-1-git-send-email-markwalters1009@gmail.com>
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\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: Fri, 01 Nov 2013 09:29:13 -0000
\r
65 We want to load notmuch-tree when notmuch is loaded, so include it as
\r
66 a require in notmuch.el. To avoid circular dependency we need to move
\r
67 one keybinding from notmuch-tree.el to notmuch.el: it makes sense for
\r
68 it to be defined there anyway.
\r
70 Since tree is now loaded by default there is no need to print a
\r
71 message when it is loaded.
\r
73 emacs/notmuch-tree.el | 3 ---
\r
74 emacs/notmuch.el | 2 ++
\r
75 2 files changed, 2 insertions(+), 3 deletions(-)
\r
77 diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
\r
78 index d3330a0..ebfb5e7 100644
\r
79 --- a/emacs/notmuch-tree.el
\r
80 +++ b/emacs/notmuch-tree.el
\r
82 (require 'notmuch-show)
\r
83 (require 'notmuch-tag)
\r
84 (require 'notmuch-parser)
\r
85 -(require 'notmuch) ;; XXX ATM, as notmuch-search-mode-map is defined here
\r
87 (eval-when-compile (require 'cl))
\r
88 (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line))
\r
89 @@ -939,8 +938,6 @@ The arguments are:
\r
91 ;; Set up key bindings from the rest of notmuch.
\r
92 (define-key notmuch-common-keymap "z" 'notmuch-tree)
\r
93 -(define-key notmuch-search-mode-map "Z" 'notmuch-tree-from-search-current-query)
\r
94 (define-key notmuch-show-mode-map "Z" 'notmuch-tree-from-show-current-query)
\r
95 -(message "Initialised notmuch-tree")
\r
97 (provide 'notmuch-tree)
\r
98 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
99 index 19210cb..418c781 100644
\r
100 --- a/emacs/notmuch.el
\r
101 +++ b/emacs/notmuch.el
\r
103 (require 'notmuch-lib)
\r
104 (require 'notmuch-tag)
\r
105 (require 'notmuch-show)
\r
106 +(require 'notmuch-tree)
\r
107 (require 'notmuch-mua)
\r
108 (require 'notmuch-hello)
\r
109 (require 'notmuch-maildir-fcc)
\r
110 @@ -156,6 +157,7 @@ To enter a line break in customize, press \\[quoted-insert] C-j."
\r
111 (define-key map "-" 'notmuch-search-remove-tag)
\r
112 (define-key map "+" 'notmuch-search-add-tag)
\r
113 (define-key map (kbd "RET") 'notmuch-search-show-thread)
\r
114 + (define-key map "Z" 'notmuch-tree-from-search-current-query)
\r
116 "Keymap for \"notmuch search\" buffers.")
\r
117 (fset 'notmuch-search-mode-map notmuch-search-mode-map)
\r