summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-01-04 21:55:31 -0500
committerKyle Meyer <kyle@kyleam.com>2016-01-04 21:55:31 -0500
commitf26031f122ffeb1b1c7e46b9a81ae462d94c5c51 (patch)
tree7e475542464513c0dc4cedb933b09c924ce192af
parent0d666eab0a36789c5c98fa7d37b928a9f39acaa5 (diff)
downloademacs.d-f26031f122ffeb1b1c7e46b9a81ae462d94c5c51.tar.gz
lisp/init-shell.el: Delete
-rw-r--r--init.el1
-rw-r--r--lisp/init-general.el3
-rw-r--r--lisp/init-shell.el6
3 files changed, 3 insertions, 7 deletions
diff --git a/init.el b/init.el
index 1e2492f..76d0b7e 100644
--- a/init.el
+++ b/init.el
@@ -35,7 +35,6 @@
(require 'init-god)
(require 'init-elisp)
-(require 'init-shell)
(require 'init-haskell)
(require 'init-python)
(require 'init-ess)
diff --git a/lisp/init-general.el b/lisp/init-general.el
index 1882fb7..cc4efdf 100644
--- a/lisp/init-general.el
+++ b/lisp/init-general.el
@@ -33,6 +33,9 @@
(add-hook 'text-mode-hook 'turn-on-auto-fill)
+(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
+(add-to-list 'auto-mode-alist '("\\.*rc\\'" . conf-unix-mode))
+
;; Taken from
;; http://milkbox.net/note/single-file-master-emacs-configuration/.
(defmacro after (mode &rest body)
diff --git a/lisp/init-shell.el b/lisp/init-shell.el
deleted file mode 100644
index 06a3732..0000000
--- a/lisp/init-shell.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;;; Shell and configuration files
-
-(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
-(add-to-list 'auto-mode-alist '("\\.*rc\\'" . conf-unix-mode))
-
-(provide 'init-shell)