 (setq ac-auto-start 3)
 (setq ac-auto-show-menu 3)
 
-;;; js
+;;; javascript
 (require 'js3-mode)
 (add-hook 'js2-mode-hook (lambda()
 			   (ac-js2-mode)


;;; git
;;(require 'vc-git)
(require 'magit)

(custom-set-variables
 ;; custom-set-variables was added by Custom.

			   (js3-auto-indent-p t)
			   (js3-enter-indents-newline t)
			   (js3-indent-on-enter-key t)))

;;; JSON
(require 'flymake-json)
(add-hook 'json-mode 'flymake-json-load)

;;; force c++-mode
(add-to-list 'auto-mode-alist '("\\.cpp\\'" . c++-mode))
