diff options
| -rw-r--r-- | .emacs | 6 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | emacsen/Makefile | 9 | ||||
| m--------- | emacsen/haskell-mode | 0 |
4 files changed, 18 insertions, 0 deletions
@@ -2,6 +2,7 @@ (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/dictem") +(add-to-list 'load-path "~/.emacs.d/haskell-mode") (add-to-list 'load-path "~/.emacs.d/popup") (add-to-list 'load-path "~/.emacs.d/magit") (add-to-list 'load-path "~/.emacs.d/markdown-mode") @@ -37,6 +38,11 @@ (require 'epa-file) (epa-file-enable) +;;;; HASKELL-MODE +(require 'haskell-mode) +(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode) +(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation) + ;;;; MAGIT (require 'magit) diff --git a/.gitmodules b/.gitmodules index 56da3d1..daa7271 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "emacsen/bbdb"] path = emacsen/bbdb url = git://git.savannah.nongnu.org/bbdb.git +[submodule "emacsen/haskell-mode"] + path = emacsen/haskell-mode + url = git@github.com:haskell/haskell-mode.git diff --git a/emacsen/Makefile b/emacsen/Makefile index d6f859b..0dd480e 100644 --- a/emacsen/Makefile +++ b/emacsen/Makefile @@ -8,6 +8,7 @@ SUBDIRS = auto-complete \ auto-indent-mode \ bbdb \ dictem \ + haskell-mode \ magit \ markdown-mode \ popup \ @@ -56,6 +57,10 @@ make-bbdb: make-vm cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD) --without-tex-dir --with-vm-dir=$(EMACSEN)/vm/lisp $(MAKE) -C $(@:make-%=%) +make-haskell-mode: + $(MAKE) -C $(@:make-%=%) compile + touch $@ + make-proofgeneral: $(MAKE) -C $(@:make-%=%) compile @@ -83,6 +88,10 @@ install-color-theme-6.6.0: -mkdir -p $(EMACSD)/$(@:install-%=%) $(MAKE) -C $(@:install-%=%) -e ELISPDIR=$(EMACSD)/$(@:install-%=%) install +install-haskell-mode: make-haskell-mode + -mkdir -p $(EMACSD)/$(@:install-%=%) + install -m 644 $(@:install-%=%)/*.elc $(EMACSD)/$(@:install-%=%) + install-magit: -mkdir -p $(EMACSD)/$(@:install-%=%) $(MAKE) -C $(@:install-%=%) -e PREFIX="" -e DESTDIR=$(EMACSD) \ diff --git a/emacsen/haskell-mode b/emacsen/haskell-mode new file mode 160000 +Subproject 7f885ccf29bf35d7b0f546eb25669565dd3911b |