summaryrefslogtreecommitdiff
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--settings/setup-clojure-mode.el3
-rw-r--r--settings/setup-web-mode.el1
-rw-r--r--settings/setup-yaml-mode.el7
3 files changed, 8 insertions, 3 deletions
diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el
index 2c2e9b3..109b074 100644
--- a/settings/setup-clojure-mode.el
+++ b/settings/setup-clojure-mode.el
@@ -5,7 +5,4 @@
(add-hook 'clojure-mode-hook 'enable-paredit-mode)
(add-hook 'clojure-mode-hook 'prettify-symbols-mode)
-;; This should be in it's own setup file
-(add-to-list 'auto-mode-alist '("\\.el\\'" . paredit-mode))
-
(provide 'setup-clojure-mode)
diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el
index b3893cf..5491d6a 100644
--- a/settings/setup-web-mode.el
+++ b/settings/setup-web-mode.el
@@ -3,6 +3,7 @@
(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
diff --git a/settings/setup-yaml-mode.el b/settings/setup-yaml-mode.el
new file mode 100644
index 0000000..f4e8a71
--- /dev/null
+++ b/settings/setup-yaml-mode.el
@@ -0,0 +1,7 @@
+(require 'yaml-mode)
+
+(add-hook 'yaml-mode-hook
+ (lambda ()
+ (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
+
+(provide 'setup-yaml-mode)