diff options
| -rw-r--r-- | .emacs | 4 | ||||
| -rw-r--r-- | emacsen/Makefile | 16 |
2 files changed, 7 insertions, 13 deletions
@@ -3,6 +3,7 @@ (add-to-list 'load-path "~/.emacs.d/auto-complete") (add-to-list 'load-path "~/.emacs.d/bbdb") (add-to-list 'load-path "~/.emacs.d/dictem") +(add-to-list 'load-path "~/.emacs.d/dtrt-indent") (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") @@ -37,6 +38,9 @@ ;;;; DICTEM (require 'dictem) +;;;; DTRT-INDENT +(require 'dtrt-indent) + ;;; EasyPG, bunled with emacs for encrypted files (require 'epa-file) (epa-file-enable) diff --git a/emacsen/Makefile b/emacsen/Makefile index 2e63ee9..19702da 100644 --- a/emacsen/Makefile +++ b/emacsen/Makefile @@ -8,6 +8,7 @@ SUBDIRS = auto-complete \ auto-indent-mode \ bbdb \ dictem \ + dtrt-indent \ haskell-mode \ magit \ markdown-mode \ @@ -43,7 +44,7 @@ $(CLEANDIRS): [ ! -f $(@:clean-%=%)/Makefile ] || $(MAKE) -C $(@:clean-%=%) clean # Manual overrides: -make-auto-indent-mode make-markdown-mode make-popup make-dictem: +make-auto-indent-mode make-markdown-mode make-popup make-dictem make-dtrt-indent: touch $@ clean-auto-indent-mode clean-markdown-mode clean-popup clean-dictem: @@ -80,15 +81,11 @@ install-auto-complete: $(MAKE) -C $(@:install-%=%) -e DIR=$(EMACSD)/$(@:install-%=%) \ -e EMACS="emacs -L lib/popup/" install -install-auto-indent-mode: - -mkdir -p $(EMACSD)/$(@:install-%=%) - cp $(@:install-%=%)/auto-indent-mode.el $(EMACSD)/$(@:install-%=%) - install-bbdb: -mkdir -p $(EMACSD)/$(@:install-%=%) $(MAKE) -C $(@:install-%=%) -e lispdir=$(EMACSD)/$(@:install-%=%) install -install-dictem: +install-auto-indent-mode install-dictem install-dtrt-indent install-markdown-mode install-popup: -mkdir -p $(EMACSD)/$(@:install-%=%) install -m 644 $(@:install-%=%)/*.el $(EMACSD)/$(@:install-%=%) @@ -104,13 +101,6 @@ 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-%=%) - install -m 644 $(@:install-%=%)/popup.el $(EMACSD)/$(@:install-%=%)/ install-proofgeneral: -mkdir -p $(EMACSD)/$(@:install-%=%) |