Permalink
Browse files

Remove js2-mode in favor of js-mode.

  • Loading branch information...
1 parent 14bc821 commit 6589ab49f107008e975e245a6d330aea87424df0 @bretthoerner committed Jan 3, 2013
Showing with 14 additions and 14 deletions.
  1. +0 −3 .gitmodules
  2. +14 −10 init.el
  3. +0 −1 submodules/js2-mode
View
@@ -22,9 +22,6 @@
[submodule "submodules/scpaste"]
path = submodules/scpaste
url = git@github.com:bretthoerner/scpaste.git
-[submodule "submodules/js2-mode"]
- path = submodules/js2-mode
- url = git@github.com:bretthoerner/js2-mode.git
[submodule "submodules/smex"]
path = submodules/smex
url = git@github.com:bretthoerner/smex.git
View
24 init.el
@@ -321,13 +321,17 @@ makes)."
;; imenu
(require 'imenu)
+;; js-mode
+(setq js-indent-level 2)
+
;; js2-mode
-(require 'js2-mode)
-(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-(setq js2-highlight-level 3
- js2-bounce-indent-p t
- js2-consistent-level-indent-inner-bracket-p t
- js2-pretty-multiline-decl-indentation-p t)
+;; (require 'js2-mode)
+;; (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+;; (setq js2-highlight-level 3
+;; js2-bounce-indent-p t
+;; js2-consistent-level-indent-inner-bracket-p t
+;; js2-pretty-multiline-decl-indentation-p t
+;; js2-basic-offset 2)
;; js-comint
(require 'js-comint)
@@ -737,10 +741,10 @@ makes)."
;; (which-func-mode 1)
;; yasnippet
-;; (add-to-list 'load-path (concat dotfiles-dir "yasnippet"))
-;; (require 'yasnippet)
-;; (setq yas/snippet-dirs '("~/.emacs.d/yasnippet/snippets"))
-;; (yas-global-mode 1)
+(add-to-list 'load-path (concat dotfiles-dir "yasnippet"))
+(require 'yasnippet)
+(setq yas/snippet-dirs '("~/.emacs.d/yasnippet/snippets"))
+(yas-global-mode 1)
;; diminish (needs to be run after other modes are loaded)
(when (require 'diminish nil 'noerror)
Submodule js2-mode deleted from 8b7858

0 comments on commit 6589ab4

Please sign in to comment.