Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 01c8b7b202eb7c7f3d2259b900cd9770ec1ebd50..8dda359397e305c70e8d66094c804363970b0c9c 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -161,6 +161,13 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; glsl
+(autoload 'glsl-mode "glsl-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.vert\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
+
 ;; session
 (require-if-present 'session)
 
@@ -422,10 +429,6 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq cperl-indent-level 4)
 (setq cperl-indent-parens-as-block t)
 
-;; Lua
-(autoload 'lua-mode "lua-mode" "Lua Mode" t)
-(add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-mode))
-
 ;; Erlang
 (require-if-present 'erlang-start)
 (setq erlang-electric-commands nil)
@@ -618,6 +621,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(js2-indent-on-enter-key nil)
  '(js2-mirror-mode nil)
  '(js2-use-font-lock-faces t)
+ '(lua-indent-level 4)
  '(makefile-mode-hook (quote ((lambda nil (set-variable (quote tab-width) 8)))))
  '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist