--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 E2E37431FD7\r
+ for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:48:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 kMBSWFLanOkN for <notmuch@notmuchmail.org>;\r
+ Wed, 30 Oct 2013 11:48:20 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id E654A431FCF\r
+ for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:48:19 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1VbaoO-0004LH-F9; Wed, 30 Oct 2013 18:48:15 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1VbaoO-0003gB-1p; Wed, 30 Oct 2013 18:48:12 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 00/11] Move notmuch-tree to mainline\r
+In-Reply-To: <m2bo26eiy8.fsf@guru.guru-group.fi>\r
+References: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>\r
+ <m2bo26eiy8.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 30 Oct 2013 18:48:10 +0000\r
+Message-ID: <87d2mm8uj9.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 91e31d0220c74927fff2a9c926c6b196 (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Wed, 30 Oct 2013 18:48:25 -0000\r
+\r
+\r
+Hi\r
+\r
+Thanks for the review\r
+\r
+On Wed, 30 Oct 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Wed, Oct 30 2013, Mark Walters <markwalters1009@gmail.com> wrote:\r
+>\r
+>> This is a more complete version of the move of pick/tree to\r
+>> mainline. The previous version was at\r
+>> id:1382257699-29860-1-git-send-email-markwalters1009@gmail.com\r
+>\r
+> This series looks pretty good to me. IMO patches 1-6 are ready...\r
+>\r
+>> The previous version did not get the autoloading right: it all worked\r
+>> on my setup as I had stale files around in my tree which were loaded.\r
+>> This versions builds and tests pass at each stage on a fresh clone.\r
+>\r
+> You and Me seem to have different understanding what "autoload"ing means.\r
+\r
+Sorry about that; I just meant that it was automatically loaded when\r
+notmuch was loaded (that is the user no longer needs an explicit\r
+(require 'notmuch-tree) in their .emacs file.\r
+\r
+I would probably just stick with the require approach (to be consistent\r
+with show etc) unless you (or others) prefer the real autoload as you\r
+describe.\r
+\r
+I will fix the commit messages in the next version.\r
+\r
+Many thanks\r
+\r
+Mark\r
+\r
+\r
+> To me autoloading means using (autoload ...) function. In patch 7\r
+> ( id:1383087338-10220-8-git-send-email-markwalters1009@gmail.com )\r
+> (require 'notmuch-tree) is used.\r
+>\r
+> To me it is fine if this approach is taken, but then calling it autoloading\r
+> in commit message (in patches 7 and 8) is confusing.\r
+>\r
+> However, if (autoload ...) syntax were actually used, it could be done\r
+> the somewhat the following way:\r
+>\r
+> * Don't add (require 'notmuch-tree) in notmuch.el (Patch 7) \r
+>\r
+> * Add (autoload 'notmuch-tree-from-search-current-query "notmuch-tree" "docstring" t)\r
+> to notmuch.el (maybe we can live without declare-function ?)\r
+>\r
+> * Add (autoload 'notmuch-tree "notmuch-tree" "docstring" t) to \r
+> notmuch-lib.el.\r
+>\r
+> * Now Patch 9 is good as it is now.\r
+>\r
+> * Don't move the functions mentioned in Patch 9 from notmuch-tree.el to\r
+> notmuch.el but write autoload (for notmuch-tree-from-search-thread) to\r
+> notmuch.el\r
+>\r
+> * Now Patch 10 is good as it is now.\r
+>\r
+> * Leave notmuch-tree-from-show-current-query in notmuch-tree.el, and add\r
+> autoload for it in notmuch-show.el. Now you can also drop \r
+> (declare-function notmuch-tree ...) out from notmuch-show.el (Patch 11).\r
+>\r
+>\r
+> Tomi\r
+>\r
+>\r
+>> The diffstat at the bottom of this message is huge, so I include the\r
+>> rather more informative output from git diff -stat -M here.\r
+>>\r
+>> Apart from the first patch (which moves 80 lines from notmuch.el to notmuch-lib.el) the total is:\r
+>> emacs/Makefile.local | 1 +\r
+>> emacs/notmuch-lib.el | 1 +\r
+>> emacs/notmuch-show.el | 10 ++++\r
+>> {contrib/notmuch-pick => emacs}/notmuch-tree.el | 47 ++-----------------\r
+>> emacs/notmuch.el | 16 +++++++\r
+>> {contrib/notmuch-pick/test => test}/emacs-tree | 13 -----\r
+>> test/notmuch-test | 1 +\r
+>> .../tree.expected-output/notmuch-tree-show-window | 0\r
+>> .../notmuch-tree-single-thread | 0\r
+>> .../tree.expected-output/notmuch-tree-tag-inbox | 0\r
+>> .../notmuch-tree-tag-inbox-tagged | 0\r
+>> .../notmuch-tree-tag-inbox-thread-tagged | 0\r
+>> 12 files changed, 34 insertions(+), 55 deletions(-)\r
+>>\r
+>>\r
+>> Obviously this clashes with the remap/help series at\r
+>> id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com but\r
+>> rebasing either way would be easy.\r
+>>\r
+>> Best wishes\r
+>>\r
+>> Mark\r
+>>\r
+>>\r
+>>\r
+>>\r
+>>\r
+>> Mark Walters (11):\r
+>> emacs: move notmuch-help to lib\r
+>> emacs: tree: remove unneeded declarations\r
+>> emacs: move notmuch-tree from contrib to mainline\r
+>> emacs: add tree to the makefile\r
+>> test: move emacs-tree test into mainline\r
+>> emacs: tree: remove test for emacs from tree test\r
+>> emacs: minimal change to autoload notmuch-tree\r
+>> test: tree: remove require from tests\r
+>> emacs: move search based tree functions to notmuch.el\r
+>> emacs: add z to common keymap\r
+>> emacs: move the show entry to tree into show.el\r
+>>\r
+>> contrib/notmuch-pick/notmuch-tree.el | 951 --------------------\r
+>> contrib/notmuch-pick/test/emacs-tree | 210 -----\r
+>> .../tree.expected-output/notmuch-tree-show-window | 40 -\r
+>> .../notmuch-tree-single-thread | 6 -\r
+>> .../tree.expected-output/notmuch-tree-tag-inbox | 53 --\r
+>> .../notmuch-tree-tag-inbox-tagged | 53 --\r
+>> .../notmuch-tree-tag-inbox-thread-tagged | 53 --\r
+>> emacs/Makefile.local | 1 +\r
+>> emacs/notmuch-lib.el | 88 ++\r
+>> emacs/notmuch-show.el | 10 +\r
+>> emacs/notmuch-tree.el | 914 +++++++++++++++++++\r
+>> emacs/notmuch.el | 103 +--\r
+>> test/emacs-tree | 197 ++++\r
+>> test/notmuch-test | 1 +\r
+>> test/tree.expected-output/notmuch-tree-show-window | 40 +\r
+>> .../notmuch-tree-single-thread | 6 +\r
+>> test/tree.expected-output/notmuch-tree-tag-inbox | 53 ++\r
+>> .../notmuch-tree-tag-inbox-tagged | 53 ++\r
+>> .../notmuch-tree-tag-inbox-thread-tagged | 53 ++\r
+>> 19 files changed, 1432 insertions(+), 1453 deletions(-)\r
+>> delete mode 100644 contrib/notmuch-pick/notmuch-tree.el\r
+>> delete mode 100755 contrib/notmuch-pick/test/emacs-tree\r
+>> delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window\r
+>> delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread\r
+>> delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox\r
+>> delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
+>> delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
+>> create mode 100644 emacs/notmuch-tree.el\r
+>> create mode 100755 test/emacs-tree\r
+>> create mode 100644 test/tree.expected-output/notmuch-tree-show-window\r
+>> create mode 100644 test/tree.expected-output/notmuch-tree-single-thread\r
+>> create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox\r
+>> create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
+>> create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
+>>\r
+>> -- \r
+>> 1.7.9.1\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff