aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-02-06 00:30:18 -0800
committerGravatar Tom Willemse2019-02-06 00:30:18 -0800
commitbfaa8b17635df2a825b20335e980b80857d104e7 (patch)
treef605d4224ad2ee157df3a72dd685eea323713f18 /emacs
parentde1de473643c2e5aa4e995ee67c3f47549e48aa5 (diff)
downloadnew-dotfiles-bfaa8b17635df2a825b20335e980b80857d104e7.tar.gz
new-dotfiles-bfaa8b17635df2a825b20335e980b80857d104e7.zip
Move ‘js2-mode’ configuration to emacs-config
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el1
-rw-r--r--emacs/.emacs.d/init/oni-js2-init.el48
2 files changed, 0 insertions, 49 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 39cbf90..115ccac 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -229,7 +229,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
(with-eval-after-load 'gnus (load "oni-gnus-init"))
(with-eval-after-load 'jabber (load "oni-jabber-init"))
(with-eval-after-load 'js (load "oni-js-mode-init"))
-(with-eval-after-load 'js2-mode (load "oni-js2-init"))
(with-eval-after-load 'lui (load "oni-lui-init"))
(with-eval-after-load 'magit (load "oni-magit-init"))
(with-eval-after-load 'org (load "oni-org-init"))
diff --git a/emacs/.emacs.d/init/oni-js2-init.el b/emacs/.emacs.d/init/oni-js2-init.el
deleted file mode 100644
index df2191d..0000000
--- a/emacs/.emacs.d/init/oni-js2-init.el
+++ /dev/null
@@ -1,48 +0,0 @@
-;;; oni-js2-init.el --- JS2-mode configuration -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords: local
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My `js2-mode' configuration.
-
-;;; Code:
-
-(require 'js2-mode)
-(require 'js2-refactor)
-
-(setq js2-include-node-externs t)
-(setq js2-strict-trailing-comma-warning nil)
-(setq js2-strict-missing-semi-warning nil)
-(setq js2-basic-offset 2)
-
-(add-hook 'js2-mode-hook 'subword-mode)
-(add-hook 'js2-mode-hook 'flycheck-mode)
-(add-hook 'js2-mode-hook 'company-mode)
-(add-hook 'js2-mode-hook 'fci-mode)
-(add-hook 'js2-mode-hook 'electric-pair-local-mode)
-(add-hook 'js2-mode-hook 'tern-mode)
-(add-hook 'js2-mode-hook 'js2-refactor-mode)
-(add-hook 'js2-mode-hook 'fic-mode)
-(add-hook 'js2-mode-hook 'whitespace-only-tabs-mode)
-
-(js2r-add-keybindings-with-prefix "C-c r")
-
-(provide 'oni-js2-init)
-;;; oni-js2-init.el ends here