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 4827585407868cf2e51b1a2c40b7c10b01ee0d64..684da588fc365a40499da802954f4371491d92a5 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)
 
@@ -173,6 +180,9 @@
 ;; mediawiki
 (require-if-present 'mediawiki)
 
+;; midnight
+(require-if-present 'midnight)
+
 ;; jaspace
 (require-if-present 'jaspace)
 
@@ -422,10 +432,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)
@@ -571,6 +577,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(appt-message-warning-time 20)
  '(browse-url-browser-function (quote browse-url-firefox))
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
+ '(clean-buffer-list-delay-general 7)
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
  '(compilation-scroll-output (quote first-error))
@@ -681,6 +688,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      (30 subj)
      "|"
      (0 body))))
+ '(midnight-mode t)
  '(mouse-wheel-progessive-speed nil)
  '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control)))))
  '(mpc-browser-tags