Random tweaks

This commit is contained in:
Ivan Malison 2015-08-20 03:23:13 -07:00
parent bc09322567
commit 199d2dde67

View File

@ -30,7 +30,7 @@
(defvar machine-custom "~/.emacs.d/this-machine.el") (defvar machine-custom "~/.emacs.d/this-machine.el")
(setq custom-file "~/.emacs.d/custom-before.el") (setq custom-file "~/.emacs.d/custom-before.el")
(when (file-exists-p custom-file) (load custom-file)) (when (file-exists-p custom-file) (load custom-file))
(setq custom-after-file "~/.emacs.d/custom-after.el") (defvar custom-after-file "~/.emacs.d/custom-after.el")
(when (file-exists-p machine-custom) (load machine-custom)) (when (file-exists-p machine-custom) (load machine-custom))
;; ============================================================================= ;; =============================================================================
@ -82,7 +82,6 @@
(use-package diminish) (use-package diminish)
(use-package bind-key) (use-package bind-key)
(use-package bug-hunter) (use-package bug-hunter)
(use-package benchmark-init (use-package benchmark-init
@ -1805,7 +1804,7 @@ window is active in the perspective."
(("C-c b" . web-beautify-js)) (("C-c b" . web-beautify-js))
:init :init
(progn (progn
(setq imalison:identifier-count 0) (defvar-setq imalison:identifier-count 0)
(defun imalison:console-log-unique () (defun imalison:console-log-unique ()
(interactive) (interactive)
(let* ((identifier-string (int-to-string imalison:identifier-count)) (let* ((identifier-string (int-to-string imalison:identifier-count))
@ -1815,7 +1814,6 @@ window is active in the perspective."
(defun imalison:js2-mode-hook () (defun imalison:js2-mode-hook ()
;; Sensible defaults ;; Sensible defaults
(setq js2-bounce-indent-p nil (setq js2-bounce-indent-p nil
js2-basic-offset 4
js2-indent-level 4 js2-indent-level 4
js2-basic-offset 4 js2-basic-offset 4
js2-highlight-level 3 js2-highlight-level 3
@ -1823,8 +1821,6 @@ window is active in the perspective."
js2-mode-show-parse-errors nil js2-mode-show-parse-errors nil
js2-mode-show-strict-warnings nil js2-mode-show-strict-warnings nil
indent-tabs-mode nil indent-tabs-mode nil
js2-indent-level 4
js2-basic-offset 4
js2-indent-switch-body t) js2-indent-switch-body t)
(edconf-find-file-hook) ;; Make sure that editorconfig takes precedence (edconf-find-file-hook) ;; Make sure that editorconfig takes precedence
(tern-mode t) (tern-mode t)