summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs7
1 files changed, 7 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index 284f5da..40d868f 100644
--- a/.emacs
+++ b/.emacs
@@ -109,6 +109,7 @@
109;;(autoload 'php-mode "php-mode" "Mode for editing PHP source files") 109;;(autoload 'php-mode "php-mode" "Mode for editing PHP source files")
110;;(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode)) 110;;(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
111 111
112
112;; Lua 113;; Lua
113(autoload 'lua-mode "lua-mode" "Lua editing mode." t) 114(autoload 'lua-mode "lua-mode" "Lua editing mode." t)
114(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) 115(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
@@ -128,11 +129,17 @@
128 "Major mode for editing GitHub Flavored Markdown files" t) 129 "Major mode for editing GitHub Flavored Markdown files" t)
129(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode)) 130(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
130 131
132
131;; YAML 133;; YAML
132(require 'yaml-mode) 134(require 'yaml-mode)
133(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) 135(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
134 136
137
135;; yasnippet 138;; yasnippet
136(require 'yasnippet) 139(require 'yasnippet)
137(yas-global-mode 1) 140(yas-global-mode 1)
138(yas/load-directory "~/.emacs.d/snippets") 141(yas/load-directory "~/.emacs.d/snippets")
142
143
144;; nginx
145;; (require 'nginx-mode)