From f1dd82483c495ba3738624500fda2a544c506666 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin@aminb.org>
Date: Mon, 16 Jul 2018 18:47:14 -0400
Subject: [emacs] assimilate org (from source)
and bring in org-notmuch from contrib/
---
.gitmodules | 10 ++++++++++
init.org | 2 ++
lib/org | 1 +
3 files changed, 13 insertions(+)
create mode 160000 lib/org
diff --git a/.gitmodules b/.gitmodules
index 722fbe3..f861ab8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -134,6 +134,16 @@
build-step = make
build-step = make sphinx-texinfo
build-step = borg-makeinfo
+[submodule "org"]
+ path = lib/org
+ url = git@code.orgmode.org:bzg/org-mode.git
+ load-path = lisp
+ info-path = doc
+ build-step = make compile autoloads info ORG_ADD_CONTRIB="org-notmuch"
+ # setting ORG_ADD_CONTRIB results in copying of files from contrib/
+ # into lisp/, which git will pick up. so, let's ignore untracked files
+ # from org's submodule; at least for now
+ ignore = untracked
[submodule "ox-hugo"]
path = lib/ox-hugo
url = git@github.com:kaushalmodi/ox-hugo.git
diff --git a/init.org b/init.org
index b7506e1..36a2071 100644
--- a/init.org
+++ b/init.org
@@ -659,6 +659,8 @@ In short, my favourite way of life.
org-html-postamble nil)
(add-hook 'org-mode-hook 'org-indent-mode)
(use-package htmlize)
+(use-package org-notmuch
+ :after (:any org notmuch))
#+end_src
*** [[https://magit.vc/][Magit]]
diff --git a/lib/org b/lib/org
new file mode 160000
index 0000000..76e38e8
--- /dev/null
+++ b/lib/org
@@ -0,0 +1 @@
+Subproject commit 76e38e8c545c623411af3a86ba896892f98f500b
--
cgit v1.2.3-83-g751a