New mmm-mode

nelhage · Oct 7, 2013 · 999ef76 · 999ef76
1 parent 97e1ae5
commit 999ef76
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "site/bbdb"]
 	path = site/bbdb
 	url = git://git.savannah.nongnu.org/bbdb.git
+[submodule "site/mmm-mode"]
+	path = site/mmm-mode
+	url = git@github.com:purcell/mmm-mode.git
diff --git a/dot-emacs b/dot-emacs
@@ -1025,6 +1025,14 @@
      (define-key ruby-mode-map (kbd "M-TAB") 'dabbrev-expand)
      (setq ruby-program-name "irb --inf-ruby-mode -rubygems")))
 
+;; mmm-mode and ERB
+(require 'mmm-auto)
+(require 'mmm-erb)
+(setq mmm-global-mode 'maybe)
+
+(mmm-add-mode-ext-class 'html-erb-mode "\\.erb\\'" 'erb)
+(add-to-list 'auto-mode-alist '("\\.erb\\'" . html-erb-mode))
+
 ;; Matlab
 
 (autoload 'matlab-mode "matlab" "Enter MATLAB mode." t)

diff --git a/mmm-mode b/mmm-mode
@@ -0,0 +1 @@
+site/mmm-mode/
diff --git a/site/mmm-mode b/site/mmm-mode