summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.emacs4
-rw-r--r--.emacs.d/el-get-init.el2
-rw-r--r--.emacs.d/evil-settings.el21
3 files changed, 3 insertions, 24 deletions
diff --git a/.emacs b/.emacs
index 5f189b5..8ac6d01 100644
--- a/.emacs
+++ b/.emacs
@@ -4,8 +4,8 @@
(load "el-get-init")
;; evil
-(require 'evil)
-(load "evil-settings")
+;(require 'evil)
+;(load "evil-settings")
;(evil-mode 1)
;; clipboard options
diff --git a/.emacs.d/el-get-init.el b/.emacs.d/el-get-init.el
index 73f175c..cb127ce 100644
--- a/.emacs.d/el-get-init.el
+++ b/.emacs.d/el-get-init.el
@@ -15,7 +15,7 @@
(setq my-packages
(append
- '(color-theme evil el-get sml-mode)
+ '(color-theme el-get sml-mode)
(mapcar 'el-get-source-name el-get-sources)))
(el-get 'sync my-packages)
diff --git a/.emacs.d/evil-settings.el b/.emacs.d/evil-settings.el
deleted file mode 100644
index 9821a4f..0000000
--- a/.emacs.d/evil-settings.el
+++ /dev/null
@@ -1,21 +0,0 @@
-; correct cursor color
-(setq evil-default-cursor (quote (t "Grey")))
-
-; Y == y$
-(evil-define-operator evil-yank-line-end (beg end type register)
- "Yank to end of line."
- :motion evil-end-of-line
- (interactive "<R><x>")
- (evil-yank beg end type register))
-
-(define-key evil-normal-state-map "Y" 'evil-yank-line-end)
-
-; make unicode-tokens work
-(setq repair-unicode-shortcuts
- '(progn
- (message "Repairing Unicode Shortcuts for Evil")
- (unicode-tokens-use-shortcuts 0)
- (unicode-tokens-use-shortcuts 1)))
-
-(eval-after-load 'isar repair-unicode-shortcuts)
-