X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=63bfcfa57c424071fad509f6b8095d5e07e9d383;hb=7867ad02e3b851de019695a0c4606d44551aa4c9;hp=76623cf1035d7bbcbacbaccc7b96092dfa47cc88;hpb=6838e67061c5175bc04f9beb4d6f3e2e8ec7388e;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 76623cf..63bfcfa 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -161,20 +161,34 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
-;; session
-(require-if-present 'session)
+;; ditz
+(require-if-present 'ditz)
 
 ;; flyspell
 (require-if-present 'flyspell)
 
-;; ditz
-(require-if-present 'ditz)
+;; jaspace
+(require-if-present 'jaspace)
+
+;; 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))
+
+;; rust
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+
+;; session
+(require-if-present 'session)
 
 ;; mediawiki
 (require-if-present 'mediawiki)
 
-;; jaspace
-(require-if-present 'jaspace)
+;; midnight
+(require-if-present 'midnight)
 
 ;; color-theme
 (require-if-present 'color-theme)
@@ -567,6 +581,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))
@@ -677,6 +692,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