Permalink
Browse files

Merge branch 'master' of https://github.com/magnars/.emacs.d

Conflicts:
	site-lisp/crappy-jsp-mode
  • Loading branch information...
2 parents 66c3893 + 9a029ec commit 542ea30e6192da3e5be4190374b70d8c1ded13e4 @cjohansen committed Mar 20, 2014
Showing with 6 additions and 4 deletions.
  1. +3 −1 .mc-lists.el
  2. +1 −1 mode-mappings.el
  3. +1 −1 site-lisp/crappy-jsp-mode
  4. +1 −1 site-lisp/expand-region
View
@@ -26,6 +26,7 @@
cider-eval-last-sexp
clj-hippie-expand-no-case-fold
cljr-cycle-coll
+ cljr-raise-sexp
cljr-unwind
cua-replace-region
cua-set-mark
@@ -45,8 +46,8 @@
hippie-expand-no-case-fold
html-paragraph
html-wrap-in-tag
- isearch-forward-use-region
insert-postfix-whitespace
+ isearch-forward-use-region
js2-beginning-of-line
js2-end-of-line
js2-insert-and-indent
@@ -174,6 +175,7 @@
mc/add-cursors-to-all-matches
multiple-cursors-mode
ns-prev-frame
+ paredit-backward-kill-word
persp-switch
shell
smex
View
@@ -30,7 +30,7 @@
(add-to-list 'auto-mode-alist '("\\.jade$" . jade-mode))
;; HTML
-(add-to-list 'auto-mode-alist '("\\.html\\'" . html-mode))
+(add-to-list 'auto-mode-alist '("\\.html\\'" . crappy-jsp-mode))
(add-to-list 'auto-mode-alist '("\\.tag$" . html-mode))
(add-to-list 'auto-mode-alist '("\\.vm$" . html-mode))

0 comments on commit 542ea30

Please sign in to comment.