--- /dev/null
+Return-Path: <too@guru-group.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 28D47431E64\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Sep 2013 06:41:59 -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 LNaly5TMZOiK for <notmuch@notmuchmail.org>;\r
+ Wed, 4 Sep 2013 06:41:53 -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 E3784431FDD\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Sep 2013 06:41:52 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id A966D100063; Wed, 4 Sep 2013 16:41:44 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [ALT PATCH] emacs: target one-notmuch.el[c] -- emacs client in one\r
+ .el[c] file\r
+Date: Wed, 4 Sep 2013 16:41:42 +0300\r
+Message-Id: <1378302102-14383-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <1378150636-26822-1-git-send-email-tomi.ollila@iki.fi\e[D>\r
+References: <1378150636-26822-1-git-send-email-tomi.ollila@iki.fi\e[D>\r
+Cc: tomi.ollila@iki.fi\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, 04 Sep 2013 13:41:59 -0000\r
+\r
+Added Makefile recipes to create notmuch emacs client in just one\r
+.el[c] file.\r
+\r
+This is an experimental feature and not built by default.\r
+\r
+This is useful for example when one wants to build the latest\r
+emacs client and then distribute the elisp file to many machines.\r
+\r
+This is also useful for (initial) testing:\r
+\r
+ make emacs/one-notmuch.elc\r
+ emacs -q -l emacs/one-notmuch.elc -f notmuch\r
+\r
+can be used to quickly experiment with new development.\r
+---\r
+\r
+This is alternative to\r
+\r
+id:1378150636-26822-1-git-send-email-tomi.ollila@iki.fi\r
+\r
+notmuch-one* was changed to one-notmuch*\r
+\r
+Now the created files do not "pollute" notmuch-* filenamespace\r
+and is easier to distinquish.\r
+\r
+See the referred email for more usage possibilities.\r
+\r
+ emacs/Makefile.local | 14 ++++++++++++++\r
+ 1 file changed, 14 insertions(+)\r
+\r
+diff --git a/emacs/Makefile.local b/emacs/Makefile.local\r
+index a910aff..7f3526d 100644\r
+--- a/emacs/Makefile.local\r
++++ b/emacs/Makefile.local\r
+@@ -46,6 +46,20 @@ endif\r
+ install: install-emacs\r
+ endif\r
+ \r
++# Unsupported hack to provide notmuch emacs client in one *.elc file.\r
++# It probably works -- or then it fails mysteriously. YMMV.\r
++# Enter `make emacs/one-notmuch.elc' in top level directory to build it.\r
++ifeq ($(HAVE_EMACS),1)\r
++$(dir)/one-notmuch.el: $(emacs_sources)\r
++ rm -f $(emacs_bytecode) # XXX\r
++ make -n all WITH_EMACS=1 | sed -n '/printf.*EMACS/ s/.* //p' | \\r
++ xargs grep -vh '(declare-function.*"notmuch' > '$@' || :\r
++ { echo ';; Local Variables:'; \\r
++ echo ';; byte-compile-warnings: (not cl-functions)'; \\r
++ echo ';; End:'; } >> '$@'\r
++endif\r
++CLEAN+=$(dir)/one-notmuch.el $(dir)/one-notmuch.elc\r
++\r
+ .PHONY: install-emacs\r
+ install-emacs:\r
+ mkdir -p "$(DESTDIR)$(emacslispdir)"\r
+-- \r
+1.8.0\r
+\r