--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 58730431FD6\r
+ for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:02:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 dUX81p3ZL+sp for <notmuch@notmuchmail.org>;\r
+ Wed, 30 Oct 2013 11:02:00 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id BBB60431FCF\r
+ for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:01:59 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 7E11C1000B2;\r
+ Wed, 30 Oct 2013 20:01:51 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 00/11] Move notmuch-tree to mainline\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
+User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 30 Oct 2013 20:01:51 +0200\r
+Message-ID: <m2bo26eiy8.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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:02:08 -0000\r
+\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
+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