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 684da588fc365a40499da802954f4371491d92a5..34b7454ccf425af97a8a65fba7a9098258a32d50 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -161,6 +161,15 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; ditz
+(require-if-present 'ditz)
+
+;; flyspell
+(require-if-present 'flyspell)
+
+;; jaspace
+(require-if-present 'jaspace)
+
 ;; glsl
 (autoload 'glsl-mode "glsl-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
@@ -168,24 +177,19 @@
 (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)
 
-;; flyspell
-(require-if-present 'flyspell)
-
-;; ditz
-(require-if-present 'ditz)
-
 ;; mediawiki
 (require-if-present 'mediawiki)
 
 ;; midnight
 (require-if-present 'midnight)
 
-;; jaspace
-(require-if-present 'jaspace)
-
 ;; color-theme
 (require-if-present 'color-theme)
 (if (featurep 'color-theme)
@@ -341,8 +345,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t)
 
 ;; javascript
-(autoload 'js2-mode "js2" nil t)
-(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode))
 (add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
 
 ;; typescript
@@ -730,10 +733,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
  '(select-enable-clipboard t)
  '(session-use-package t nil (session))
- '(tramp-auto-save-directory "/tmp/tramp-auto-save")
- '(tramp-completion-reread-directory-timeout 2)
- '(tramp-default-host "localhost")
- '(tramp-default-method "sshx")
+ '(tramp-auto-save-directory "/tmp/tramp-auto-save" nil (tramp))
+ '(tramp-completion-reread-directory-timeout 2 nil (tramp))
+ '(tramp-default-host "localhost" nil (tramp))
+ '(tramp-default-method "sshx" nil (tramp))
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(uniquify-trailing-separator-p t)
  '(vc-cvs-diff-switches (quote ("-u")))
@@ -755,7 +758,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(whitespace-style
    (quote
     (face tabs trailing space-before-tab newline indentation empty space-after-tab)))
- '(woman-cache-filename "~/.wmncach.el"))
+ '(woman-cache-filename "~/.wmncach.el")
+ '(yaml-block-literal-electric-alist (quote ((62 . "-")))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.