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 7084821c78d88798b7233c09569ac4480e08d0f9..48a9e4755ff15e3787915bedbfc31384698310d5 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -174,6 +174,11 @@
 ;; jaspace
 (require-if-present 'jaspace)
 
+;; json
+(require-if-present 'json-par)
+(if (featurep 'json-par)
+    (add-hook 'json-mode-hook #'json-par-mode))
+
 ;; pkgdiff
 (add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff")
 (autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t)
@@ -331,8 +336,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
-(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode))
-(add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
 
 ;; typescript
 (autoload 'typescript-mode "typescript-mode"
@@ -718,7 +722,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (elscreen-fr color-theme-modern elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (json-par nim-mode elscreen-fr color-theme-modern elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(projectile-mode t nil (projectile))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")