aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.emacs7
-rw-r--r--.gitmodules3
-rw-r--r--emacsen/Makefile8
m---------emacsen/markdown-mode0
4 files changed, 16 insertions, 2 deletions
diff --git a/.emacs b/.emacs
index 198f79b..f1c386b 100644
--- a/.emacs
+++ b/.emacs
@@ -1,6 +1,8 @@
+(add-to-list 'load-path "~/.emacs.d")
(add-to-list 'load-path "~/.emacs.d/auto-indent-mode")
(add-to-list 'load-path "~/.emacs.d/auto-complete")
(add-to-list 'load-path "~/.emacs.d/magit")
+(add-to-list 'load-path "~/.emacs.d/markdown-mode")
(add-to-list 'load-path "~/.emacs.d/proofgeneral/")
(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/vm")
@@ -18,6 +20,11 @@
;;;; MAGIT
(require 'magit)
+;;;; MARKDOWN-MODE
+(autoload 'markdown-mode "markdown-mode"
+ "Major mode for editing Markdown files" t)
+(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+
;;;; PROOFGENERAL
(load-file "~/.emacs.d/proofgeneral/generic/proof-site.el")
diff --git a/.gitmodules b/.gitmodules
index 5f2626e..81c119d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
[submodule "emacsen/popup"]
path = emacsen/popup
url = git@github.com:auto-complete/popup-el.git
+[submodule "emacsen/markdown-mode"]
+ path = emacsen/markdown-mode
+ url = git://jblevins.org/git/markdown-mode.git
diff --git a/emacsen/Makefile b/emacsen/Makefile
index 9a3abcf..3ee01e9 100644
--- a/emacsen/Makefile
+++ b/emacsen/Makefile
@@ -6,6 +6,7 @@ export ELISPDIR
SUBDIRS = auto-complete \
auto-indent-mode \
magit \
+ markdown-mode \
popup \
proofgeneral
# color-theme-6.6.0 \
@@ -35,10 +36,10 @@ $(CLEANDIRS):
$(MAKE) -C $(@:clean-%=%) clean
# Manual overrides:
-make-auto-indent-mode make-popup:
+make-auto-indent-mode make-markdown-mode make-popup:
touch $@
-clean-auto-indent-mode:
+clean-auto-indent-mode clean-markdown-mode clean-popup:
echo $@
make-auto-complete:
@@ -64,6 +65,9 @@ install-magit:
-mkdir -p $(EMACSD)/$(@:install-%=%)
$(MAKE) -C $(@:install-%=%) -e PREFIX="" -e DESTDIR=$(EMACSD) \
-e SYSCONFDIR="" -e ELISP_INSTALL_DIR=$(EMACSD)/$(@:install-%=%) install
+install-markdown-mode:
+ mkdir -p $(EMACSD)/$(@:install-%=%)
+ install -m 644 $(@:install-%=%)/markdown-mode.el $(EMACSD)/$(@:install-%=%)/
install-popup:
mkdir -p $(EMACSD)/$(@:install-%=%)
diff --git a/emacsen/markdown-mode b/emacsen/markdown-mode
new file mode 160000
+Subproject 278baf5b1c7f8f72fb2e35403bcd65019052d9e